CSS Validator Issue Tracking

• All active CSS Validator issues
-
• All active CSS Validator legacy issues
+
• All active CSS Validator legacy issues
• New CSS Validator issue

-

+

-

W3C^® SOFTWARE NOTICE AND LICENSE

Copyright © 1997-2002 World +

Copyright © 1997-2002 World Wide Web Consortium, (Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en Automatique, Keio University). All Rights +href="https://www.keio.ac.jp/">Keio University). All Rights Reserved. http://www.w3.org/Consortium/Legal/

This W3C work (including software, documents, or other related @@ -39,11 +39,11 @@

Copyright © 1997-2002 World following form (hypertext is preferred, text is permitted) should be used within the body of any redistributed or derivative code: "Copyright © [$date-of-software] World Wide Web Consortium, (World Wide Web Consortium, (Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en Automatique, Keio University). All Rights +href="https://www.keio.ac.jp/">Keio University). All Rights Reserved. http://www.w3.org/Consortium/Legal/"

Notice of any changes or modifications to the W3C files, @@ -86,7 +86,7 @@

Copyright © 1997-2002 World

 

-

webmaster
+

webmaster
(last updated $Date$)

diff --git a/DOWNLOAD.html.bg b/DOWNLOAD.html.bg index ccd6f3aee..31cda2807 100644 --- a/DOWNLOAD.html.bg +++ b/DOWNLOAD.html.bg @@ -19,7 +19,7 @@

-

+

CSS Validation Service

Проверете Cascading Style Sheets (CSS) и (X)HTML документи със style sheets @@ -40,7 +40,7 @@

Изтегляне на java пакет (jar или war)

-

css-validator.jar

+

css-validator.jar

Указател за инсталиране

@@ -58,9 +58,9 @@

Това ръководство за инсталиране приема, че сте изтеглили, инсталирали и тествали:

• Работеща java среда
-
• Инструментът за създаване на java Ant
+
• Инструментът за създаване на java Ant
• Java уеб сървлет контейнер като, - Jigsaw, Tomcat или + Jigsaw, Tomcat или Jetty, ако сте планирали да използвате валидатора като онлайн услуга. Това ръководство засяга подробно само Tomcat и Jigsaw.

@@ -72,9 +72,9 @@ би трябвало да откриете в [TOMCAT_DIR]/common/lib/) вероятно с името servlet-api.jar. Ако не, вземете я от java.sun.com

-

jigsaw.jar

+

jigsaw.jar

xercesImpl.jar и xml-apis.jar (които могат да бъдат изтеглени с - xerces-j-bin).

+ xerces-j-bin).

tagsoup.jar

@@ -205,33 +205,16 @@ http://localhost:8001/css-validator/validator.html

- +

-Подкрепете този инструмент, станете
- + + +

-

- Copyright © 1994-2007 - W3C® - - (MIT, - ERCIM, - Keio), - All Rights Reserved. - W3C liability, - trademark, - document use - - and software licensing - - rules apply. Your interactions with this site are in accordance - with our public and - Member privacy - statements. -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/DOWNLOAD.html.de b/DOWNLOAD.html.de index c0dd26408..97ab1ba4b 100644 --- a/DOWNLOAD.html.de +++ b/DOWNLOAD.html.de @@ -11,7 +11,7 @@

-

+

CSS Validierungsdienst

Check Cascading Style Sheets (CSS) and (X)HTML documents with style sheets @@ -27,14 +27,14 @@

Den CSS Validator herunterladen

Quellcode herunterladen

-

Der CSS Validator ist zum Download per CVS verfügbar. Folgen Sie den Anweisungen +

Der CSS Validator ist zum Download per CVS verfügbar. Folgen Sie den Anweisungen zum Zugriff auf den öffentlichen W3C CVS-Server und laden Sie 2002/css-validator herunter. Beachten Sie, dass die Online-Version des CSS-Validators in der Regel älter ist als die CVS-Version. Ergebnisse und Aussehen können leicht abweichen...

Download als Java-Package (.jar oder .war)

-

css-validator.jar

+

css-validator.jar

Installationsanleitung

Der CSS Validierungsservice ist eine in Java geschriebene @@ -46,15 +46,15 @@ Anleitung aber hauptsächlich Details über die Installation als Online-Servlet mit der Apache Servlet-Engine Tomcat geben.

Ein paar Anweisungen zur Installation als Servlet mit Jigsaw und zum Betrieb von der Kommandozeile finden Sie weiter unten.

Voraussetzungen

Die Installationsanleitung geht davon aus, dass Sie die folgenden Werkzeuge heruntergeladen, installiert und getestet haben:

• Eine funktionierende Java-Umgebung
-
• Das Bauwerkzeug Ant
-
• Einen Java Web-Servlet-Container wie Jigsaw, Tomcat oder Jetty, falls Sie vorhaben den Validator als Online-Dienst zu betreiben. Die Anleitung behandelt nur Tomcat und Jigsaw im Detail..
+
• Das Bauwerkzeug Ant
+
• Einen Java Web-Servlet-Container wie Jigsaw, Tomcat oder Jetty, falls Sie vorhaben den Validator als Online-Dienst zu betreiben. Die Anleitung behandelt nur Tomcat und Jigsaw im Detail.

Für die Installation auf Ihrem System benötigen Sie die folgenden Java-Bibliotheken:

• servlet.jar (die Sie, wenn Sie Tomcat in [TOMCAT_DIR] installiert haben, in [TOMCAT_DIR]/common/lib/ finden sollten, möglicherweise unter dem Namen servlet-api.jar. Wenn nicht, können Sie die Bibliothek bei java.sun.com herunterladen
-
• jigsaw.jar
-
• xercesImpl.jar und xml-apis.jar (beide können mit xerces-j-bin heruntergeladen werden).
+
• jigsaw.jar
+
• xercesImpl.jar und xml-apis.jar (beide können mit xerces-j-bin heruntergeladen werden).
• tagsoup.jar

@@ -218,34 +218,16 @@ das css-validator.jar wie oben beschrieben, und starten Sie es wie folgt:

- +

- - + +

-

- Copyright © 1994-2009 - W3C® - - (MIT, - ERCIM, - Keio), - All Rights Reserved. - W3C liability, - trademark, - document use - - and software licensing - - rules apply. Your interactions with this site are in accordance - with our public and - Member privacy - statements. -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/DOWNLOAD.html.el b/DOWNLOAD.html.el index d23969ace..8eb65c2df 100644 --- a/DOWNLOAD.html.el +++ b/DOWNLOAD.html.el @@ -18,7 +18,7 @@

-

+

Υπηρεσία Ελέγχου Εγκυρότητας CSS

Έλεγχος Cascading Style Sheets (CSS) και εγγράφων (X)HTML με style sheets @@ -37,7 +37,7 @@

Λήψη του αρχείου Java (jar)

-

css-validator.jar

+

css-validator.jar

Οδηγός Εγκατάστασης

Η υπηρεσία Έλεγχος Εγκυρότητας CSS βασίζεται σε ένα servlet που είναι κωδικοποιημένο με βάση την cross-platform γλώσσα προγραμματισμού Java, και μπορεί να εγκατασταθεί σε οποιαδήποτε πλατφόρμα servlet. Αν και το επίσημη service από την W3C εκτελείται σε διακομιστή Jigsaw @@ -48,9 +48,9 @@

Ο οδηγός υποθέτει ότι έχετε εγκαταστήσει επιτυχώς ήδη στον υπολογιστή σας τα παρακάτω:

• ένα περιβάλλον java που λειτουργεί κανονικά,
-
• το εργαλείο προγραμματισμού Ant της java,
-
• έναν Java servlet container όπως τους Jigsaw, -Tomcat ή Jetty, σε περίπτωση που σκοπεύετε να παρέχετε τον ελεγκτή εγκυρότητας ως μία υπηρεσία web.
+
• το εργαλείο προγραμματισμού Ant της java,
+
• έναν Java servlet container όπως τους Jigsaw, +Tomcat ή Jetty, σε περίπτωση που σκοπεύετε να παρέχετε τον ελεγκτή εγκυρότητας ως μία υπηρεσία web.

Για την εγκατάσταση προαπαιτείται να γνωρίζετε ολόκληρο το μονοπάτι της java βιβλιοθήκης με όνομα servlet.jar. @@ -199,29 +199,17 @@ http://localhost:8001/css-validator/validator.html

- +

- - + +

-

- Πνευματικά Δικαιώματα © 1994-2009 - W3C® +

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

- (MIT, - ERCIM, - Keio), - Με επιφύλαξη παντός δικαιώματος. - Εφαρμόζονται οι κανόνες της W3C για ευθύνη, - καταχωρημένο εμπορικό σήμα, - χρήση εγγράφου - - και άδεια χρήσης λογισμικού. Η αλληλεπίδραση σας με αυτόν τον ιστότοπο γίνεται σύμφωνα με τις δηλώσεις μας απορρήτου για δημόσια χρήση και για τα - Μέλη.

diff --git a/DOWNLOAD.html.en b/DOWNLOAD.html.en index 08193f286..7e466947c 100644 --- a/DOWNLOAD.html.en +++ b/DOWNLOAD.html.en @@ -18,7 +18,7 @@

-

+

CSS Validation Service

Check Cascading Style Sheets (CSS) and (X)HTML documents with style sheets @@ -40,7 +40,7 @@ generally a little older than the version under Git, and their results and behav

Download the Java archive (jar)

-

css-validator.jar

+

css-validator.jar

Installation Guide

The CSS Validation service is based on a servlet written in the cross-platform Java language, and can @@ -53,9 +53,9 @@ generally a little older than the version under Git, and their results and behav

This guide assumes that you have already downloaded and installed successfully the following:

• a working java environment ;
-
• the Ant java build tool ;
-
• a Java servlet container such as Jigsaw, -Tomcat or Jetty, if you plan to provide the validator as a web service.
+
• the Ant java build tool ;
+
• a Java servlet container such as Jigsaw, +Tomcat or Jetty, if you plan to provide the validator as a web service.

As a prerequisite to the installation, you will need to know the complete path to the java library called servlet.jar. @@ -212,39 +212,19 @@ Download the css-validator.jar jar archive (or build it with ant jar) - -

- +

- - + +

-

- Copyright © 1994-2009 - W3C® - - (MIT, - ERCIM, - Keio), - All Rights Reserved. - W3C liability, - trademark, - document use - - and software licensing - - rules apply. Your interactions with this site are in accordance - with our public and - Member privacy - statements. -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/DOWNLOAD.html.es b/DOWNLOAD.html.es index 5ae7fb7ae..71a3822ec 100644 --- a/DOWNLOAD.html.es +++ b/DOWNLOAD.html.es @@ -15,7 +15,7 @@

-

+

Servicio de Validación de CSS

Check Cascading Style Sheets (CSS) and (X)HTML documents with style sheets @@ -31,14 +31,14 @@

Descarga la fuente

El validador de CSS está disponible para su descarga mediante CVS. - Sigue las instrucciones para acceder + Sigue las instrucciones para acceder al servidor público de CVS del W3C y descarga 2002/css-validator. Ten en cuenta que la versión en línea del Validador de CSS es, generalmente, más antigua que la versión CVS, de modo que los resultados y la apariencia pueden variar ligeramente...

Descarga como un paquete java (jar o war)

-

css-validator.jar

+

css-validator.jar

Guía de instalación

@@ -52,10 +52,10 @@ Sin embargo, por simplicidad, en este documento proporcionaremos principalmente

Esta guía de instalación asume que has descargado, instalado y probado:

• Un entorno java en funcionamiento,
-
• La herramienta de desarrollo java Ant +
• La herramienta de desarrollo java Ant
• Un contenedor del servlet Web java, como - Jigsaw, Tomcat o + Jigsaw, Tomcat o Jetty si planeas utilizar el validador como un servicio en línea. Esta guía únicamente cubre en detalle Tomcat y Jigsaw.

@@ -67,10 +67,10 @@ Sin embargo, por simplicidad, en este documento proporcionaremos principalmente java.sun.com

-jigsaw.jar +jigsaw.jar

xercesImpl.jar y xml-apis.jar (que puedes descargar con - xerces-j-bin).

+ xerces-j-bin).

tagsoup.jar

Instalación del Validador de CSS con Tomcat

@@ -251,44 +251,17 @@ http://localhost:8001/css-validator/validator.html

- - - - - +

- - + +

-

-Copyright © 1994-2009 - -W3C -® - - ( -MIT -, - -ERCIM -, - Keio), - All Rights Reserved. - W3C liability, - trademark, - document use +

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

- and software licensing - - rules apply. Your interactions with this site are in accordance - with our public and - Member privacy - statements. -

diff --git a/DOWNLOAD.html.fa b/DOWNLOAD.html.fa index 5d771e2bc..f63be4d5d 100644 --- a/DOWNLOAD.html.fa +++ b/DOWNLOAD.html.fa @@ -17,7 +17,7 @@

-

سرویس اعتبار سنجی CSS

محک زدن شیوه نامه های آبشاری (CSS) و اسناد X)HTML) حاوی شیوه نامه ها

+

سرویس اعتبار سنجی CSS

محک زدن شیوه نامه های آبشاری (CSS) و اسناد X)HTML) حاوی شیوه نامه ها

دانلود و نصب اعتبار سنج CSS

@@ -27,7 +27,7 @@

 اعتبار سنج CSS برای دانلود با استفاده از CVS در دسترس است. - دستورالعمل ها را جهت دسترسی به + دستورالعمل ها را جهت دسترسی به سرویس دهنده ی عمومی W3C CVS و بدست آوردن 2002/css-validator دنبال کنید. توجه داشته باشید نسخه ی آنلاین اعتبار سنج CSS بطور کلی قدیمی تر از نسخه ی CVS @@ -35,7 +35,7 @@

دانلود بصورت بسته ی جاوا (jar یا war)

-

css-validator.jar

+

css-validator.jar

راهنمای نصب

@@ -55,9 +55,9 @@

در این راهنمای نصب و راه اندازی فرض بر این است که شما موارد زیر را دانلود، نصب و تست نموده اید:

• یک محیط کاری جاوا،
-
• ابزار ساختمان غیر جاوا
+
• ابزار ساختمان غیر جاوا
• یک نگهدارنده ی سرولت (servlet) وب از قبیل - Jigsaw، Tomcat + Jigsaw، Tomcat یا Jetty در صورتی که شما طرح کاربرد اعتبار سنج بصورت سرویسی آنلاین را در نظر داشته باشید. @@ -72,9 +72,9 @@ احتمالا تحت نام servlet-api.jar یافته باشید. اگر نه، آنرا در java.sun.com بدست آورید.
-
• jigsaw.jar
+
• jigsaw.jar
• xercesImpl.jar و xml-apis.jar (که می توان با - xerces-j-bin دانلود + xerces-j-bin دانلود شده باشد).
• tagsoup.jar

@@ -224,56 +224,16 @@ http://localhost:8001/css-validator/validator.html

- +

-حمایت از این ابزار و تبدیل شدن به
- + + +

-

- کلیه - حقوق چاپ و نشر © 1994-2007 - - W3C ® برای - - (MIT, - - ERCIM, - Keio)، - محفوظ است. - W3C ، رعایت قوانین مربوط به - - مارک تجاری، - استفاده - از سند و - مجوز - استفاده نرم افزار را - - الزامی نموده است. تعامل شما با این سایت بر اساس بیانیه اختصاصی - - اعضا و - - گروه ما می باشد.
- Copyright © 1994-2007 - W3C® - - (MIT, - ERCIM, - Keio), - All Rights Reserved. - W3C liability, - trademark, - document use - - and software licensing - - rules apply. Your interactions with this site are in accordance - with our public and - Member privacy - statements. -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/DOWNLOAD.html.fr b/DOWNLOAD.html.fr index d6eb79ab7..bc939b8cc 100644 --- a/DOWNLOAD.html.fr +++ b/DOWNLOAD.html.fr @@ -17,7 +17,7 @@

-

+

Service de validation CSS

Check Cascading Style Sheets (CSS) and (X)HTML documents with style sheets @@ -38,7 +38,7 @@ de sorte que les résultats et leur comportement peuvent varier légèrement.

Télécharger un paquetage Java (jar)

-

css-validator.jar

+

css-validator.jar

Guide d'installation

Le service de validation CSS est un servlet écrit en Java. On peut l'installer sur n'importe quel moteur de servlets, @@ -54,9 +54,9 @@ en ligne de commande.

Ce guide d'installation suppose que vous avez téléchargé, installé et testé :

• Un environnement Java fonctionnel ;
-
• L'outil de construction Java Ant ;
-
• Un conteneur de servlet Web Java tel que Jigsaw, -Tomcat ou Jetty, si vous prévoyez d'utiliser le validateur +
• L'outil de construction Java Ant ;
+
• Un conteneur de servlet Web Java tel que Jigsaw, +Tomcat ou Jetty, si vous prévoyez d'utiliser le validateur comme service en ligne. Ce guide couvre dans le détail seulement Tomcat et Jigsaw.

@@ -222,29 +222,17 @@ Construisez le fichier css-validator.jar avec la commande ant jar, et

- +

- - + +

-

-Copyright © 1994-2009 -W3C® -(MIT, -ERCIM, -Keio), tous droits réservés. -Les règles de responsabilité, -de nom de marque, -d'utilisation des documents -et d'octroi de licences logicielles -du W3C s'appliquent. Vos interactions avec ce site sont conformes à nos déclarations de confidentialité -publiques et vis-à-vis -de nos membres. -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

+

diff --git a/DOWNLOAD.html.hi b/DOWNLOAD.html.hi index 404056c23..f77473ab5 100644 --- a/DOWNLOAD.html.hi +++ b/DOWNLOAD.html.hi @@ -18,7 +18,7 @@

-

+

सीएसएस मान्यकरण सेवा

शैली (सीएसएस) शीट शैली पत्रक और के साथ (एक्स) HTML दस्तावेजों @@ -34,13 +34,13 @@

डाउनलोड स्रोत कोड

सीएसएस मान्यकरण के CVS स्रोत के साथ पुनः प्राप्त किया जा सकता है. करने के लिए W3C. CVS सर्वर - से कनेक्ट करने के निर्देशों का पालन करें,और + से कनेक्ट करने के निर्देशों का पालन करें,और 2002/css-मान्यकर्ता मॉड्यूल पुनः प्राप्त. कृपया ध्यान दें कि सीएसएस मान्यकर्ता के लिए ऑनलाइन सेवा एक स्थिर जारी है, आम तौर पर एक छोटे से CVS के तहत पुराने संस्करण है, और उनके परिणाम और व्यवहार अलग हो सकता.

जावा संग्रह को डाउनलोड करें (jar)

- + सीएसएस मान्यकर्ता.jar

अधिष्ठापन गाइड

सीएसएस मान्यकरण सेवा एक पार मंच जावा भाषा में लिखा सर्वलेट पर आधारित है, @@ -52,9 +52,9 @@

यह गाइड रखती है कि आप पहले से ही डाउनलोड किया है और सफलतापूर्वक स्थापित:

• एक काम जावा वातावरण;
-
• अंत उपकरण का निर्माण जावा ;
-
• Jigsaw, - Tomcat or +
• अंत उपकरण का निर्माण जावा ;
+
• Jigsaw, + Tomcat or Jettyके रूप में एक जावा सर्वलेट कंटेनर, यदि आप एक वेब सेवा के रूप में उपलब्ध कराने की योजना मान्यकर्ता.

@@ -169,30 +169,13 @@

- - +

-

- +

+

-

- - Copyright © 1994-2009 - W3C® (MIT, - - - ERCIM, Keio), All Rights - Reserved. W3C - liability, - trademark, - - document use and - - software licensing rules apply. Your interactions with this site are in - accordance with our - public - and Member - privacy statements.

+ +

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/DOWNLOAD.html.it b/DOWNLOAD.html.it index 02aa4ffef..c91a44e39 100644 --- a/DOWNLOAD.html.it +++ b/DOWNLOAD.html.it @@ -19,7 +19,7 @@

-

+

Servizio di validazione CSS

Check Cascading Style Sheets (CSS) and (X)HTML documents with style sheets @@ -41,7 +41,7 @@

Scarica come pacchetto java (jar oppure war)

-

css-validator.jar

+

css-validator.jar

@@ -57,8 +57,8 @@ In ogni caso, per semplicità, in questo documento forniremo dettagli su come in

Questa guida di installazione presume che hai scaricato, installato e testato:

• Un ambiente operativo Java
-
• Lo strumento di compilazione java Ant
-
• Un raccoglitore di servlet java per il Web come Jigsaw, Tomcat oppure +
• Lo strumento di compilazione java Ant
+
• Un raccoglitore di servlet java per il Web come Jigsaw, Tomcat oppure Jetty, se si desidera utilizzare il validatore come servizio on-line. Questa guida riporta in dettaglio solamente Tomcat e Jigsaw.

@@ -67,8 +67,8 @@ In ogni caso, per semplicità, in questo documento forniremo dettagli su come in

servlet.jar (la quale, se possiedi Tomcat installato in [TOMCAT_DIR], la trovi nella cartella [TOMCAT_DIR]/common/lib/, possibilmente con il nome servlet-api.jar. Se non è presente, puoi ottenerne una nel sito java.sun.com

-

jigsaw.jar

-

xercesImpl.jar e xml-apis.jar (le quali possono essere scaricatte con xerces-j-bin).

+

jigsaw.jar

+

xercesImpl.jar e xml-apis.jar (le quali possono essere scaricatte con xerces-j-bin).

tagsoup.jar

@@ -230,34 +230,19 @@ http://localhost:8001/css-validator/validator.html - -

- +

- - + +

-

- Copyright © 1994-2009 - W3C® - - (MIT, - ERCIM, - Keio), - Tutti i diritti riservati. - Si applicano le regole del W3C riguardanti la responsabilità, - marchi depositati, - l'utilizzo dei documenti - - e le licenze software. L'interazione con i contenuti di questi siti è in accordo con le nostre definizioni di pubblico e privato per quanto riguarda la riservatezza delle informazioni. -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/DOWNLOAD.html.ja b/DOWNLOAD.html.ja index 17db5a0c3..bf3df0432 100644 --- a/DOWNLOAD.html.ja +++ b/DOWNLOAD.html.ja @@ -19,7 +19,7 @@

-

+

CSS 検証サービス

Check Cascading Style Sheets (CSS) and (X)HTML documents with style sheets @@ -40,7 +40,7 @@ ガイドに従って W3C CVS 公開サーバーにアクセスし、2002/css-validator を取得してください。オンライン版のCSS 検証サービスは、stable releaseなので、一般的に CVS 版のものより古く、結果表示などが若干異なる可能性があります。

Java パッケージ (jar/war) としてダウンロード

-

css-validator.jar

+

css-validator.jar

インストールガイド

@@ -52,8 +52,8 @@

このインストールガイドでは、すでに次のものがインストールされ動作確認されているものとします:

• ただしく動作する Java 環境
-
• Java 構築ツール「Ant」
-
• Jigsaw、TomcatやJettyなどの Java ウェブサーブレットコンテナ (オンラインサービスとして利用する場合のみ)。
+
• Java 構築ツール「Ant」
+
• Jigsaw、TomcatやJettyなどの Java ウェブサーブレットコンテナ (オンラインサービスとして利用する場合のみ)。

各自のシステムに CSS 検証サービスをインストールするには、servlet.jarという Java ライブラリが必要です。これは、Tomcat のインストールパスを [TOMCAT_DIR] とすると、[TOMCAT_DIR]/common/lib/ にあるでしょう。servlet-api.jar という名前になっていることもあります。見当たらない場合は、java.sun.com で入手して下さい。

@@ -204,30 +204,15 @@ css-validator.jar を上の説明にしたがって作成したら、次のよ

- +

- - + +

-

- Copyright © 1994-2009 - W3C® - - (MIT, - ERCIM, - 慶應義塾大学), - All Rights Reserved. - W3C の責任範囲、 - 商標、 - 文書の利用、 - そしてライセンス - の規則が適用されます。 - このサイトの訪問者は、私たちの一般およびメンバープライバシー声明に従うものとします。 - -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/DOWNLOAD.html.ko b/DOWNLOAD.html.ko index df7aa7565..33894ae37 100644 --- a/DOWNLOAD.html.ko +++ b/DOWNLOAD.html.ko @@ -18,7 +18,7 @@

-

+

CSS 검사 서비스

캐스케이딩 스타일시트 (CSS)와 스타일시트를 포함한 문서를 검사 @@ -41,7 +41,7 @@

Java 패키지로 다운로드 (jar 또는 war 형식)

-

css-validator.jar

+

css-validator.jar

설치 안내

@@ -57,9 +57,9 @@ Jigsaw 서버를 이용하여 서비스하고 있습니다. 이 문서에서는

아래 설명은 다음 환경이 설치되어 동작한다는 가정 하에 설명하고 있습니다.

• 동작하는 자바 환경
-
• Ant와 같은 자바 빌드 툴
+
• Ant와 같은 자바 빌드 툴
• 아울러, 온라인 상에서 사용할 수 있는 서비스로 제공할 예정일 경우 - Jigsaw, Tomcat 또는 + Jigsaw, Tomcat 또는 Jetty 등의 자바 웹 서블릿이 동작할 수 있는 환경이 필요합니다. 여기에서는 Tomcat과 Jigsaw에 대해서만 다루고 있습니다.

@@ -71,9 +71,9 @@ Jigsaw 서버를 이용하여 서비스하고 있습니다. 이 문서에서는 [TOMCAT_DIR]/common/lib/)에 servlet-api.jar 이라는 이름으로 저장되어 있을 가능성이 높습니다. 만일 없을 경우, java.sun.com 에서 다운로드가 가능합니다. -

jigsaw.jar

+

jigsaw.jar

xercesImpl.jar 와 xml-apis.jar ( - xerces-j-bin과 함께 다운로드가 가능합니다).

+ xerces-j-bin과 함께 다운로드가 가능합니다).

tagsoup.jar

@@ -249,35 +249,17 @@ http://localhost:8001/css-validator/validator.html

- +

- - + +

-

- Copyright © 1994-2007 - W3C® - - (MIT, - ERCIM, - Keio), - All Rights Reserved. - W3C liability, - trademark, - document use - - and software licensing - - rules apply. Your interactions with this site are in accordance - with our public and - Member privacy - statements. -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/DOWNLOAD.html.nl b/DOWNLOAD.html.nl index 4b15fcf6f..d7d575eb7 100644 --- a/DOWNLOAD.html.nl +++ b/DOWNLOAD.html.nl @@ -17,7 +17,7 @@

-

+

CSS Validation Service

Check Cascading Style Sheets (CSS) and (X)HTML documents with style sheets @@ -44,7 +44,7 @@

Download de CSS Validator als java package (jar of war)

-

css-validator.jar

+

css-validator.jar

@@ -64,9 +64,9 @@ onderaan gegeven.

• Een werkende Java omgeving,
-
• De Ant Java builder
+
• De Ant Java builder
• Een Java Web servlet container zoals - Jigsaw, Tomcat of + Jigsaw, Tomcat of Jetty als je van plan bent de validator als een online service aan te bieden. Deze handleiding gaat alleen in detail in op de installatie van Tomcat en Jigsaw.
@@ -78,9 +78,9 @@ onderaan gegeven.
(deze bevind zich, als je Tomcat geïnstalleerd hebt, in [TOMCAT_DIR]/common/lib/, waarschijnlijk on de naam servlet-api.jar. Zo niet, haal hem hier op: java.sun.com -
• jigsaw.jar
+
• jigsaw.jar
• xercesImpl.jar en xml-apis.jar (die gedownload worden met - xerces-j-bin).
+ xerces-j-bin).
• tagsoup.jar

@@ -266,35 +266,16 @@ Java geïnstalleerd heeft. Build de css-validator.jar zoals hierboven beschr

- +

- - + +

-

- - Copyright © 1994-2009 - W3C® - - (MIT, - ERCIM, - Keio), - Alle Rechten Voorbehouden. - W3C aansprakelijkheid, - handelsmerk, - document gebruik - - en de software licentie - - regels zijn van toepassing. Je interacties met deze site zijn in overeenstemming - met onze publieke en - Member privacy - verklaringen. -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/DOWNLOAD.html.pl-PL b/DOWNLOAD.html.pl-PL index 98964a0f3..82ca941e8 100644 --- a/DOWNLOAD.html.pl-PL +++ b/DOWNLOAD.html.pl-PL @@ -18,7 +18,7 @@

-

+

Usługa Walidacji CSS

Check Cascading Style Sheets (CSS) and (X)HTML documents with style sheets @@ -45,7 +45,7 @@

Ściągnij jako pakiet Java (jar lub war)

-

css-validator.jar

+

css-validator.jar

Przewodnik instalacyjny

@@ -58,8 +58,8 @@

Przewodnik instalacyjny zakłada, że następujące komponenty zostały ściągnięte, zainstalowane i przetestowane:

• działające środowisko Javy,
-
• oparte na języku. Java narzędzie do budowania projektów Ant
-
• Kontener serwletów taki jak Jigsaw, Tomcat lub Jetty , jeśli planowane jest używanie walidatora jako usługi sieciowej. Przewodnik omawia szczegółowo jedynie Tomcat i Jigsaw.
+
• oparte na języku. Java narzędzie do budowania projektów Ant
+
• Kontener serwletów taki jak Jigsaw, Tomcat lub Jetty , jeśli planowane jest używanie walidatora jako usługi sieciowej. Przewodnik omawia szczegółowo jedynie Tomcat i Jigsaw.

Jeśli chcesz zainstalować walidator na swoim systemie, będziesz musiał ściągnąć i/lub @@ -76,8 +76,8 @@ w swoim systemie kilka bibliotek Javy:

znaleźć w [TOMCAT_DIR]/common/lib/, najprawdopodobniej pod nazwą servlet-api.jar. Jeśli nie, możesz ściągnąć ten plik z java.sun.com -

jigsaw.jar

-

xercesImpl.jar i xml-apis.jar (można je ściągnąć z xerces-j-bin).

+

jigsaw.jar

+

xercesImpl.jar i xml-apis.jar (można je ściągnąć z xerces-j-bin).

tagsoup.jar

@@ -252,39 +252,19 @@ http://localhost:8001/css-validator/validator.html - -

- +

- - + +

-

- Copyright © 1994-2009 - W3C® - - (MIT, - ERCIM, - Keio), - All Rights Reserved. - W3C liability, - trademark, - document use - - and software licensing - - rules apply. Your interactions with this site are in accordance - with our public and - Member privacy - statements. -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/DOWNLOAD.html.pt-BR b/DOWNLOAD.html.pt-BR index c130fe67a..4ee16154a 100644 --- a/DOWNLOAD.html.pt-BR +++ b/DOWNLOAD.html.pt-BR @@ -18,7 +18,7 @@

-

+

Serviço de validação CSS

Verifica folhas de estilo em cascata (CSS) e documentos (X)HTML com folhas de estilo

@@ -40,7 +40,7 @@ portanto não estranhe se houver pequenas diferenças de apresentação entre elas.

Download como um pacote java (jar ou war)

-

css-validator.jar

+

css-validator.jar

Guia de instalação

@@ -55,8 +55,8 @@ Contudo, para simplificar a situação, iremos explicar a instalação como um

Esse guia de instalação considera que você baixou, instalou e testou o seguinte:

• Um ambiente java em funcionamento,
-
• A ferramenta Ant para desenvolvimento java
-
• Um container para servlet java, tal como, Jigsaw, Tomcat ou +
• A ferramenta Ant para desenvolvimento java
+
• Um container para servlet java, tal como, Jigsaw, Tomcat ou Jetty caso você pretenda configurar um validador online. Esse guia contempla detalhes de instalação apenas para Tomcat e Jigsaw.

@@ -67,9 +67,9 @@ Contudo, para simplificar a situação, iremos explicar a instalação como um procure em [TOMCAT_DIR]/common/lib/) possivelmente com o nome servlet-api.jar. Caso contrário baixe em java.sun.com -

jigsaw.jar

+

jigsaw.jar

xercesImpl.jar e xml-apis.jar (podem ser baixados em - xerces-j-bin).

+ xerces-j-bin).

tagsoup.jar

@@ -232,39 +232,19 @@ http://localhost:8001/css-validator/validator.html - -

- +

- - + +

-

- Copyright © 1994-2007 - W3C® - - (MIT, - ERCIM, - Keio), - All Rights Reserved. - W3C liability, - trademark, - document use - - and software licensing - - rules apply. Your interactions with this site are in accordance - with our public and - Member privacy - statements. -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/DOWNLOAD.html.ro b/DOWNLOAD.html.ro index 454fb8832..003d8f2b9 100644 --- a/DOWNLOAD.html.ro +++ b/DOWNLOAD.html.ro @@ -18,7 +18,7 @@

-

+

Serviciul de validare CSS

Verifica foile de stil in cascada (CSS) si documentele (X)HTML @@ -38,7 +38,7 @@ Urmeaza instructiunile pentru a te cone

Descarca arhiva Java(jar)

-

css-validator.jar

+

css-validator.jar

Ghid de instalare

Serviciul de validare CSS se bazeaza pe un servlet scris in limbajul Java si poate fi instalat pe orice platforma servlet. IN timp ce orice serviciu oficial oferit de W3C ruleaza pe serverul Jigsaw (care este metoda de instalare recomandata), noi vom descrie in acest ghid instalarea pentru motorul de servlet Apache, Tomcat, si cateva instructiuni rapide pentru folosirea Jigsaw si a liniei de comanda.

@@ -48,9 +48,9 @@ Urmeaza instructiunile pentru a te cone

Acest ghid presupune ca ai descarcat deja si instalat cu succes urmatoarele:

• un mediu java functional;
-
• Ant unealta de constructie Java;
-
• Un servlet in limbaj Java ca si Jigsaw, -Tomcat sau Jetty, daca planuiesti sa oferi validatorul ca un serviciu Web.
+
• Ant unealta de constructie Java;
+
• Un servlet in limbaj Java ca si Jigsaw, +Tomcat sau Jetty, daca planuiesti sa oferi validatorul ca un serviciu Web.

Ca si conditie prealabila pentru instalare, va trebui sa stii adresa completa pentru libraria Java numita servlet.jar. @@ -212,34 +212,16 @@ Descarca arhiva css-validator.jar (sau construieste-o cu ant jar) si

- +

- - + +

-

- Copyright © 1994-2009 - W3C® - - (MIT, - ERCIM, - Keio), - All Rights Reserved. - W3C liability, - trademark, - document use - - and software licensing - - rules apply. Your interactions with this site are in accordance - with our public and - Member privacy - statements. -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/DOWNLOAD.html.ru b/DOWNLOAD.html.ru index a04b68b14..1e3189c4c 100644 --- a/DOWNLOAD.html.ru +++ b/DOWNLOAD.html.ru @@ -18,7 +18,7 @@

-

+

Сервис проверки CSS

Проверка таблиц каскадных стилей (CSS) и документов (X)HTML с таблицами стилей @@ -33,11 +33,11 @@

Загрузка

Загрузка исходных файлов

-

Сервис проверки CSS доступен для загрузки через CVS. Следуйте инструкциям для доступа к общедоступному серверу CVS и загрузите 2002/css-validator. Заметьте, что на jigsaw.w3.org/css-validator установлена более ранняя версия, нежели та, что хранится в репозитории CVS, так что результаты вывода и внешний вид могут незначительно различаться

+

Сервис проверки CSS доступен для загрузки через CVS. Следуйте инструкциям для доступа к общедоступному серверу CVS и загрузите 2002/css-validator. Заметьте, что на jigsaw.w3.org/css-validator установлена более ранняя версия, нежели та, что хранится в репозитории CVS, так что результаты вывода и внешний вид могут незначительно различаться

Загрузка пакета Java (jar или war)

-

css-validator.jar

+

css-validator.jar

Руководство по установке

@@ -51,16 +51,16 @@

• рабочую среду Java;
-
• средство разработки Ant;
-
• контейнер сервлетов — например, Jigsaw, Tomcat или Jetty — если планируете создать сетевой сервис; в этой инструкции подробно рассказывается только про Jigsaw и Tomcat.
+
• средство разработки Ant;
+
• контейнер сервлетов — например, Jigsaw, Tomcat или Jetty — если планируете создать сетевой сервис; в этой инструкции подробно рассказывается только про Jigsaw и Tomcat.

Для установки сервиса в своей системе необходимо загрузить или найти у себя на компьютере ряд библиотек Java:

• servlet.jar (если Tomcat установлен в [TOMCAT_DIR], то можете найти этот файл в [TOMCAT_DIR]/common/lib/); возможно, он будет называться «servlet-api.jar»; если его нет, загрузите с java.sun.com;
-
• jigsaw.jar;
-
• xercesImpl.jar и xml-apis.jar (могут быть загружены с xerces-j-bin);
+
• jigsaw.jar;
+
• xercesImpl.jar и xml-apis.jar (могут быть загружены с xerces-j-bin);
• tagsoup.jar.

@@ -204,33 +204,16 @@

- +

- - + +

-

- Copyright © 1994-2007 - W3C® - - (MIT, - ERCIM, - Keio), - All Rights Reserved. - W3C liability, - trademark, - document use - and software licensing - - rules apply. Your interactions with this site are in accordance - with our public and - Member privacy - statements. -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/DOWNLOAD.html.sv b/DOWNLOAD.html.sv index ffd319ec8..d49f22f4b 100644 --- a/DOWNLOAD.html.sv +++ b/DOWNLOAD.html.sv @@ -18,7 +18,7 @@

-

+

CSS valideringstjänst

Granska formatmallar (Cascading Style Sheets, CSS) och (X)HTML-dokument med formatmallar @@ -48,7 +48,7 @@

Ladda ned som Java-paket (jar eller war)

- css-validator.jar + css-validator.jar

Installationsanvisningar

@@ -77,11 +77,11 @@

• En fungerande Javamiljö,
-
• Ant hopbyggnadsverktyg för Java +
• Ant hopbyggnadsverktyg för Java
• En Java webb-servlet förpackning, såsom - Jigsaw, - Tomcat eller + Jigsaw, + Tomcat eller Jetty, vilket behövs om du vill använda valideraren som en online-tjänst. Denna handledning ger enbart detaljer för Tomcat och Jigsaw. @@ -102,10 +102,10 @@ Om den inte finns där, så kan du hämta den på java.sun.com
-
• jigsaw.jar +
• jigsaw.jar
• xercesImpl.jar och xml-apis.jar (som kan laddas ned med - xerces-j-bin). + xerces-j-bin).
• tagsoup.jar
@@ -332,32 +332,16 @@

- +

- - + +

-

- Copyright © 1994-2007 - W3C® - (MIT, - ERCIM, - Keio), - Rättigheter förbehållna. - W3C:s regler för - ansvar, - varumärke, - dokumentanvändning - och - programvarulicenser gäller. - Din interaktion med denna webbplats sker i enlighet med våra integritetspolicies för - allmänheten och - W3C:s medlemmar. -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/DOWNLOAD.html.uk b/DOWNLOAD.html.uk index 88cd4a5f9..327578ed5 100644 --- a/DOWNLOAD.html.uk +++ b/DOWNLOAD.html.uk @@ -18,7 +18,7 @@
-
+
Сервіс перевірки CSS
Перевірка таблиць каскадних стилів (CSS) і документів (X)HTML з таблицями стилів @@ -30,11 +30,11 @@
Завантаження
Завантаження початкових файлів
-
Сервіс перевірки CSS є доступним для завантаження через CVS. Дотримуйтесь інструкцій для доступу до загальнодоступного серверу CVS й завантажте 2002/css-validator. Зверніть увагу: на jigsaw.w3.org/css-validator встановлено більш ранню версію, ніж ту, що зберігається у репозиторії CVS, через що результати виводу і зовнішній вигляд можуть незначно розрізнятись
+
Сервіс перевірки CSS є доступним для завантаження через CVS. Дотримуйтесь інструкцій для доступу до загальнодоступного серверу CVS й завантажте 2002/css-validator. Зверніть увагу: на jigsaw.w3.org/css-validator встановлено більш ранню версію, ніж ту, що зберігається у репозиторії CVS, через що результати виводу і зовнішній вигляд можуть незначно розрізнятись
Завантаження пакета Java (jar або war)
-
css-validator.jar
+
css-validator.jar
Посібник по встановленню
@@ -48,16 +48,16 @@
• робоче середовище Java;
-
• засіб розробки Ant;
-
• контейнер сервлетів — наприклад, Jigsaw, Tomcat або Jetty — якщо плануєте створити сітьовий сервіс; в цій інструкції докладно розповідається лише про Jigsaw та Tomcat.
+
• засіб розробки Ant;
+
• контейнер сервлетів — наприклад, Jigsaw, Tomcat або Jetty — якщо плануєте створити сітьовий сервіс; в цій інструкції докладно розповідається лише про Jigsaw та Tomcat.
Для встановлення сервісу у власній системі необхідно завантажити або знайти на своєму комп'ютері низку бібліотек Java:
• servlet.jar (якщо Tomcat встановлено до [TOMCAT_DIR], то можна знайти цей файл у [TOMCAT_DIR]/common/lib/); можливо, він буде зватися «servlet-api.jar»; якщо його немає, завантажте з java.sun.com;
-
• jigsaw.jar;
-
• xercesImpl.jar і xml-apis.jar (можуть бути завантажені з xerces-j-bin);
+
• jigsaw.jar;
+
• xercesImpl.jar і xml-apis.jar (можуть бути завантажені з xerces-j-bin);
• tagsoup.jar.
@@ -147,31 +147,16 @@
- +
-
Підтримайте проект — внесіть пожертву.
- +
+ + +
-
- Copyright © 1994-2007 - W3C® - - (MIT, - ERCIM, - Keio), - All Rights Reserved. - W3C liability, - trademark, - document use - and software licensing - - rules apply. Your interactions with this site are in accordance - with our public and - Member privacy - statements. -
+
Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.
diff --git a/DOWNLOAD.html.zh-cn b/DOWNLOAD.html.zh-cn index 81a095e6a..a400ada59 100644 --- a/DOWNLOAD.html.zh-cn +++ b/DOWNLOAD.html.zh-cn @@ -18,7 +18,7 @@
-
+
CSS Validation Service
Check Cascading Style Sheets (CSS) and (X)HTML documents with style sheets @@ -40,7 +40,7 @@
下载Java包(jar包格式或者war包格式)
-
css-validator.jar
+
css-validator.jar
安装指南
@@ -55,9 +55,9 @@
本安装指南假设你已经下载，安装并测试了以下的东西：
• 一个可以使用的Java环境
-
• Ant 工具
+
• Ant 工具
• 一个java web servlet的容器例如： - Jigsaw, Tomcat 或者 + Jigsaw, Tomcat 或者 Jetty 如果你打算将验证器作为一个在线的服务，那么本安装指南只涉及到了如何在Jigsaw和Tomcat中的安装。
为了将验证器安装到你的系统中去，你需要下载或者在你系统中确认一下的java库文件是否存在：
@@ -66,9 +66,9 @@ ((在Tomcat的安装目录 [TOMCAT_DIR], 下, 你应该能在 [TOMCAT_DIR]/common/lib/这个位置找到它, 名字应该是servlet-api.jar。如果不是或者没有，那么请在 java.sun.com中下载它 -
jigsaw.jar
+
jigsaw.jar
xercesImpl.jar 和 xml-apis.jar (这些都可以在 - xerces-j-bin)下载到。
+ xerces-j-bin)下载到。
tagsoup.jar

@@ -231,32 +231,16 @@

- +

- - + +

-

- Copyright © 1994-2009 - W3C® - - (MIT, - ERCIM, - Keio), - All Rights Reserved. - W3C 责任, - 商标,已运用 - 文档授权 - - 和 软件授权 - - 相关规则。你与本站的互动是符合我们的公开 和 - 会员 隐私声明。 -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/Email.html.en b/Email.html.en index 82c416335..2699fc2ad 100644 --- a/Email.html.en +++ b/Email.html.en @@ -14,7 +14,7 @@

-

+

CSS Validation Service

Check Cascading Style Sheets (CSS) and (X)HTML documents with style sheets @@ -60,12 +60,12 @@

This mailing list is for technical discussion on Web Style Sheets. This is + href="https://www.w3.org/Style/">Web Style Sheets. This is a focused discussion area: all posts to this list must be about style sheets. The list is also the preferred place for - discussing working drafts + discussing working drafts that are published by W3C's working group on CSS (Cascading Style + href="https://www.w3.org/Style/CSS/">CSS (Cascading Style Sheets).

@@ -125,34 +125,16 @@

- +

- - + +

-

- Copyright © 1994-2009 - W3C® - - (MIT, - ERCIM, - Keio), - All Rights Reserved. - W3C liability, - trademark, - document use - - and software licensing - - rules apply. Your interactions with this site are in accordance - with our public and - Member privacy - statements. -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/Email.html.fr b/Email.html.fr index fb9a037c3..b2e120dea 100644 --- a/Email.html.fr +++ b/Email.html.fr @@ -14,7 +14,7 @@

-

+

CSS Validation Service

Check Cascading Style Sheets (CSS) and (X)HTML documents with style sheets @@ -66,12 +66,12 @@

Ce forum est destiné aux discussions techniques - relatives aux feuille de + relatives aux feuille de style du Web («Web Style Sheets»). Ce forum est également destiné aux discussions sur les documents de travail + href="https://www.w3.org/TR/">documents de travail publiés par le groupe de travail du W3C CSS («Cascading + href="https://www.w3.org/Style/CSS/">CSS («Cascading Style Sheets»).

@@ -132,29 +132,16 @@

- +

- - + +

-

- Copyright © 1994-2009 - W3C® - (MIT, - ERCIM, - Keio), tous droits réservés. - Les règles de responsabilité, - de nom de marque, - d'utilisation des documents - et d'octroi de licences logicielles - du W3C s'appliquent. Vos interactions avec ce site sont conformes à nos déclarations de confidentialité - publiques et vis-à-vis - de nos membres. -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/Email.html.ja b/Email.html.ja index d043142fa..8fb6695d4 100644 --- a/Email.html.ja +++ b/Email.html.ja @@ -16,7 +16,7 @@

-

+

CSS 検証サービス

カスケーディングスタイルシート(CSS)およびスタイルシートを組み込んだ(X)HTML文書を検証 @@ -59,10 +59,10 @@

www-style@w3.org

- Web Style Sheetsについての技術的議論のためのメーリングリストです。スタイルシートについての非常に高度な議論の場です。また、カスケーディングスタイルシート + Web Style Sheetsについての技術的議論のためのメーリングリストです。スタイルシートについての非常に高度な議論の場です。また、カスケーディングスタイルシート (CSS) についての W3C の作業部会が発行する作業ドラフトについて議論する場でもあります。 + href="https://www.w3.org/TR/">作業ドラフトについて議論する場でもあります。

このメーリングストに対するすべてのポストは

- +

- - + +

-

- Copyright © 1994-2009 - W3C® - - (MIT, - ERCIM, - Keio), - All Rights Reserved. - W3C liability, - trademark, - document use - - and software licensing - - rules apply. Your interactions with this site are in accordance - with our public and - Member privacy - statements. -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/HOWTO.html b/HOWTO.html index 7df7fa9e4..6145c9b1a 100644 --- a/HOWTO.html +++ b/HOWTO.html @@ -11,9 +11,9 @@ - -
diff --git a/README.html b/README.html index 0191addf9..c54a16fa2 100644 --- a/README.html +++ b/README.html @@ -12,9 +12,9 @@ - + -
diff --git a/README.html.nl b/README.html.nl index 087c54380..3fbf29da5 100644 --- a/README.html.nl +++ b/README.html.nl @@ -12,9 +12,9 @@ - + -
diff --git a/README.md b/README.md index fc00e216d..653f69954 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ The latest development code for the CSS Validator is available through [the GitHub repository](https://github.com/w3c/css-validator). -For a visual representation, see the [CSS Validator Sequence Diagram](https://github.com/w3c/css-validator/raw/master/docs/CSS_Validator_Sequence_Diagram.png), which is available in [png](https://github.com/w3c/css-validator/raw/master/docs/CSS_Validator_Sequence_Diagram.png), [graffle](https://github.com/w3c/css-validator/raw/master/docs/CSS_Validator_Sequence_Diagram.graffle) and [svg](https://github.com/w3c/css-validator/raw/master/docs/CSS_Validator_Sequence_Diagram.svg) formats. +For a visual representation, see the [CSS Validator Sequence Diagram](https://github.com/w3c/css-validator/blob/main/docs/CSS_Validator_Sequence_Diagram.png?raw=true), which is available in [png](https://github.com/w3c/css-validator/blob/main/docs/CSS_Validator_Sequence_Diagram.png?raw=true), [graffle](https://github.com/w3c/css-validator/blob/main/docs/CSS_Validator_Sequence_Diagram.graffle?raw=true) and [svg](https://github.com/w3c/css-validator/blob/main/docs/CSS_Validator_Sequence_Diagram.svg?raw=true) formats. If you have any questions or problems with the validator, send us an [email](https://github.com/w3c/css-validator/blob/master/Email.html.en). diff --git a/TODO.html b/TODO.html index 55f22a0e8..7a1cea1dd 100644 --- a/TODO.html +++ b/TODO.html @@ -10,7 +10,7 @@ - +

CSS

@@ -22,7 +22,7 @@

CSS Validator Issue Tracking

• All active CSS Validator issues
-
• All active CSS Validator legacy issues
+
• All active CSS Validator legacy issues
• Search CSS Validator issues
• New CSS Validator issue

diff --git a/about.html.bg b/about.html.bg index 435e288c7..069a15c41 100644 --- a/about.html.bg +++ b/about.html.bg @@ -16,7 +16,7 @@

-

+

CSS Validation Service

Проверете Cascading Style Sheets (CSS) и (X)HTML документи със style sheets @@ -72,17 +72,17 @@ CSS спецификациите, помагайки Ви да намерите

И така, тук ли е правилото, кое е верен CSS и кое не?

Не. Това е полезен и надежден инструмент, но е софтуерен инструмент, и както всеки софтуер, съдържа -някои бъгове и спорни моменти & бъгове и спорни моменти. +някои бъгове и спорни моменти & бъгове и спорни моменти. Истинския справочник по Cascading Style Sheets са CSS Спецификациите.

Колко струва?

Нищо. Услугата е безплатна. Кодът е отворен и Вие сте свободен да го изтеглите, използвате, модифицирате, разпространявате -и други. +и други. Ако наистина Ви харесва, сте добре дошли да се присъедините към проекта или да направите дарение на W3C чрез -програмата за помощ на W3C, но никой не Ви задължава в това.

+програмата за помощ на W3C, но никой не Ви задължава в това.

Кой е написал този инструмент? Кой го поддържа?

W3C поддържа и стопанисва този инструмент, благодарение на работата и приноса на персонала на W3C, @@ -92,12 +92,12 @@ CSS спецификациите, помагайки Ви да намерите

Мога ли да помогна?

Разбира се. Ако сте java програмист, можете да помогнете на проекта CSS Валидатор чрез преглеждане на кода, приспособяване и редактиране -на бъгове & бъгове, +на бъгове & бъгове, или с помощ в изграждането на нови възможности.

Не е необходимо задължително да сте програмист за да помогнете в изграждането и поддръжката на този инструмент: можете да помогнете с обогатяването на документацията, като участвате в превода на валидатор на собствения Ви език, или чрез абонирането Ви за -мейлинг-листа и дискутиране на +мейлинг-листа и дискутиране на инструмента и помощ на други потребители.

Някакви други въпроси?

@@ -190,33 +190,16 @@ sleep() между заявките към валидатора или инст

- +

-Подкрепете този инструмент, станете
- + + +

-

- Copyright © 1994-2007 - W3C® - - (MIT, - ERCIM, - Keio), - All Rights Reserved. - W3C liability, - trademark, - document use - - and software licensing - - rules apply. Your interactions with this site are in accordance - with our public and - Member privacy - statements. -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/about.html.de b/about.html.de index d2f070bc2..cb571650d 100644 --- a/about.html.de +++ b/about.html.de @@ -10,7 +10,7 @@

-

+

CSS Validierungsdienst

Check Cascading Style Sheets (CSS) and (X)HTML documents with style sheets @@ -72,12 +72,12 @@ Textformate und Layout benutzt HTML die Style-Sprache CSS, kurz für zu helfen, CSS Style Sheets zu entwickeln und, wenn nötig, zu korrigieren.

Ist der Validator die letzte Instanz wenn es um korrektes CSS geht?

-

Nein. Aber er ist ein nützliches und zuverlässiges Tool, und wie jede Software hat er Bugs und Probleme & legacy Bugs und Probleme. -Die eigentliche Referenz für Cascading Style Sheets sind die CSS Spezifikationen.

+

Nein. Aber er ist ein nützliches und zuverlässiges Tool, und wie jede Software hat er Bugs und Probleme & legacy Bugs und Probleme. +Die eigentliche Referenz für Cascading Style Sheets sind die CSS Spezifikationen.

Wieviel kostet der Validator?

-

Nichts. Der Dienst ist kostenlos. Der Quellcode ist offen, Sie können Ihn gerne herunterladen, nutzen, verändern, verbreiten oder ähnliches. Wenn Sie den Validator richtig gut finden, können Sie sich gern dem Projekt anschließen oder  W3C mit dem W3C supporters program unterstützen, aber niemand zwingt Sie dazu.

+

Nichts. Der Dienst ist kostenlos. Der Quellcode ist offen, Sie können Ihn gerne herunterladen, nutzen, verändern, verbreiten oder ähnliches. Wenn Sie den Validator richtig gut finden, können Sie sich gern dem Projekt anschließen oder  W3C mit dem W3C supporters program unterstützen, aber niemand zwingt Sie dazu.

Wer hat den Validator geschrieben? Und wer pflegt ihn?

@@ -87,12 +87,12 @@ hierzu die Seite mit Referenzen und Danksagungen.

Kann ich mithelfen?

-

Natürlich. Wenn Sie Java-Programmierer sind, können Sie dem CSS Validator Projekt helfen, indem Sie den code auschecken, sich der Bugs & legacy Bugs annehmen und sie fixen, oder mithelfen, neue Features zu bauen.

+

Natürlich. Wenn Sie Java-Programmierer sind, können Sie dem CSS Validator Projekt helfen, indem Sie den code auschecken, sich der Bugs & legacy Bugs annehmen und sie fixen, oder mithelfen, neue Features zu bauen.

Aber Sie müssen kein Programmierer sein, um beim Aufbau und der Pflege des Validators mithelfen zu können. Sie können auch beitragen, die Dokumentation zu verbessern, an der Übersetzung des Validators in -Ihre Sprache mitwirken oder sich für die Mailing-Liste registrieren und anderen Nutzern helfen bzw. über das Tool diskutieren.

+Ihre Sprache mitwirken oder sich für die Mailing-Liste registrieren und anderen Nutzern helfen bzw. über das Tool diskutieren.

Noch Fragen?

@@ -242,34 +242,16 @@ installieren Sie Ihre eigene Instanz des Validators.

- +

- - + +

-

- Copyright © 1994-2009 - W3C® - - (MIT, - ERCIM, - Keio), - All Rights Reserved. - W3C liability, - trademark, - document use - - and software licensing - - rules apply. Your interactions with this site are in accordance - with our public and - Member privacy - statements. -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/about.html.el b/about.html.el index 99ecd9cd6..4f4a90562 100644 --- a/about.html.el +++ b/about.html.el @@ -15,7 +15,7 @@

-

+

Υπηρεσία Ελέγχου Εγκυρότητας CSS

Έλεγχος Cascading Style Sheets (CSS) και εγγράφων (X)HTML με style sheets @@ -66,18 +66,18 @@ CSS, θα σας βοηθάει να εντοπίσετε τα λάθη ή τι

Οπότε, πρόκειται για μία υπηρεσία ελέγχου σχετικά με το τί είναι σωστό CSS και τι όχι;

Όχι. Είναι ένα χρήσιμο και αξιόπιστο εργαλείο, αλλά ένα εργαλείο λογισμικού, και όπως κάθε εργαλείο λογισμικού, έχει κάποια -σφάλματα και προβλήματα & σφάλματα και προβλήματα. -Η πραγματική αναφορά στα Cascading Style Sheets βρίσκεται στις Προδιαγραφές CSS.

+σφάλματα και προβλήματα & σφάλματα και προβλήματα. +Η πραγματική αναφορά στα Cascading Style Sheets βρίσκεται στις Προδιαγραφές CSS.

Τι σημαίνει “Έγκυρο CSS”; Ποια έκδοση CSS χρησιμοποιεί ο Ελεγκτής Εγκυρότητας;

-

Σύμφωνα με τις

Σύμφωνα με τις Προδιαγραφές CSS 2.1: Η εγκυρότητα ενός style sheet εξαρτάται από το επίπεδο CSS που χρησιμοποιείται στο. […] το έγκυρο CSS 2.1 style sheet πρέπει να είναι κωδικοποιημένο σύμφωνα με το γραμματική του CSS 2.1. Επιπλέον, πρέπει να περιέχει μόνο κανόνες, ονόματα, ονόματα ιδιοτήτων και τιμές ιδιοτήτων που ορίζονται στις προδιαγραφές.

Ο ελεγκτής εγκυρότητας ελέγχει τα style sheet κατά προεπιλογή για γραμματική, ιδιότητες και τιμές σύμφωνα με τις προδιαγραφές του -CSS 2.1, αλλά μπορούν να ελεγχθούν άλλα προφίλ CSS με χρήση των επιλογών.

@@ -85,19 +85,19 @@ title="Cascading Style Sheets Level 2 Revision 1 (CSS 2.1) Specification">C (αυτή που ορίζεται στο τελευταίο εγχειρίδιο χρήσης) με ένα πλήθος ιδιοτήτων και αποδεκτών τιμών που ορίζονται σε διάφορα προφίλ. Σε μία μελλοντική έκδοση του ελεγκτή εγκυρότητας, η προεπιλεγμένη επιλογή θα είναι ο έλεγχος των style sheet με βάση την τελευταία “γραμματική CSSr” και όλων των τυποποιημένων ιδιοτήτων και τιμών του CSS.

Πόσο κοστίζει;

-

Τίποτα. Η υπηρεσία είναι δωρεά. Ο πηγαίος κώδικας είναι δωρεάν και μπορείτε να τον κάνετε λήψη, τροποποιήσετε, επεξεργαστείτε, διανέμετε και άλλα. +

Τίποτα. Η υπηρεσία είναι δωρεά. Ο πηγαίος κώδικας είναι δωρεάν και μπορείτε να τον κάνετε λήψη, τροποποιήσετε, επεξεργαστείτε, διανέμετε και άλλα. Εάν σας αρέσει πραγματικά, είστε ευσπρόδεκτος να συμμετέχετε στο έργο ή να δωρίσετε χρήματα στην W3C μέσω του - W3C πρόγραμμα υποστηρικτών, αλλά κανείς δεν σας αναγκάζει να το κάνετε.

+ W3C πρόγραμμα υποστηρικτών, αλλά κανείς δεν σας αναγκάζει να το κάνετε.

Ποιος δημιούργησε αυτό το εργαλείο; Ποιος το συντηρεί;

Η W3C συντηρεί και φιλοξενεί το εργαλείο, χάρη στην εργασία και στις συνεισφορές από το προσωπικό, στους εθελοντές προγραμματιστές και μεταφραστές της W3C. Για λεπτομέριες δείτε τη σελίδα ευχαριστιών. Μπορείτε και εσείς να βοηθήσετε.

Μπορώ να βοηθήσω;

Φυσικά. Εάν είστε προγραμματιστής java, μπορείτε να βοηθήσετε στο έργο Ελεγκτή Εγκυρότητας CSS, ελέγχοντας τον κώδικα, -διορθώνοντας σφάλματα & σφάλματα +διορθώνοντας σφάλματα & σφάλματα ή βοηθώντας στη δημιουργία νέων χαρακτηριστικών.

Αλλά δε χρειάζεται να είστε προγραμματιστής για να βοηθήσετε στη δημιουργία και συντήρηση του εργαλείου, μπορείτε να βοηθήσετε στη βελτίωση του εγχειρίδιου χρήσης, να συμμετέχετε στην μετάφραση του ελεγκτή εγκυρότητας στη γλώσσα σας ή να εγγραφείτε στη -λίστα ενημέρωσης και να συζητήσετε για το εργαλείο ή να βοηθήσετε άλλους.

+λίστα ενημέρωσης και να συζητήσετε για το εργαλείο ή να βοηθήσετε άλλους.

Πως επικοινωνώ με τους δημιουργούς του ελεγκτή; Αναφέρω ένα πρόβλημα;

Εάν έχετε κάποιο ερώτημα σχετικά με τη CSS ή τον ελεγκτή εγκυρότητας CSS, ελέγξτε τις διαθέσιμες @@ -220,39 +220,19 @@ title="Cascading Style Sheets Level 2 Revision 1 (CSS 2.1) Specification">C - - - - - - -

- +

- - + +

-

- Πνευματικά Δικαιώματα © 1994-2009 - W3C® - - (MIT, - ERCIM, - Keio), - Με επιφύλαξη παντός δικαιώματος. - Εφαρμόζονται οι κανόνες της W3C για ευθύνη, - καταχωρημένο εμπορικό σήμα, - χρήση εγγράφου - - και άδεια χρήσης λογισμικού. Η αλληλεπίδραση σας με αυτόν τον ιστότοπο γίνεται σύμφωνα με τις δηλώσεις μας απορρήτου για δημόσια χρήση και για τα - Μέλη.

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/about.html.en b/about.html.en index 91931032f..c07e6ee21 100644 --- a/about.html.en +++ b/about.html.en @@ -15,7 +15,7 @@

-

+

CSS Validation Service

Check Cascading Style Sheets (CSS) and (X)HTML documents with style sheets @@ -71,19 +71,19 @@ What this tool does is help people authoring CSS check, and fix if necessary, th

So, this is the authority on what is correct CSS and what isn't?

No. It is a helpful and reliable tool, but a software tool, and like every software, it has some -bugs and issues (and legacy bugs). -The actual reference on Cascading Style Sheets are the CSS +bugs and issues (and legacy bugs). +The actual reference on Cascading Style Sheets are the CSS Specifications.

What does “Valid CSS” mean? Which version of CSS does this validator use?

-

According to the

According to the CSS 2.1 Specification: The validity of a style sheet depends on the level of CSS used for the style sheet. […] valid CSS 2.1 style sheet must be written according to the grammar of CSS 2.1. Furthermore, it must contain only at-rules, property names, and property values defined in this specification.

By default, this validator checks style sheets against the grammar, properties and values defined in the -CSS 2.1 specification, but other CSS profiles can be checked against by using the options.

@@ -95,9 +95,9 @@ style sheets against that latest “CSS grammar” and the cloud of all standard

How much does it cost?

Nothing. The service is free. The source is open and you are free to download it, use it, modify it, distribute it, -and more. +and more. If you really like it, you are welcome to join the project or donate to W3C via the - W3C supporters program, but nobody forces you to.

+ W3C supporters program, but nobody forces you to.

Who wrote this tool? Who maintains it?

W3C maintains and hosts the tool, thanks to the work and contributions by W3C staff, @@ -107,11 +107,11 @@ for details. You too can help.

Can I help?

Of course. If you are a java programmer, you can help the CSS Validator project by checking out the code, -adopting and fixing bugs & legacy bugs, +adopting and fixing bugs & legacy bugs, or helping build new features.

But you do not need to be a coder to help build and maintain this tool: you can also help improve the documentation, participate in translating the validator in your language, or subscribe to the -mailing-list and discuss about the tool +mailing-list and discuss about the tool or help other users.

Any other question?

@@ -248,44 +248,19 @@ calls to the validator, or install and run your own instance of the validator. - - - - - - -

- +

- - + +

-

- Copyright © 1994-2009 - W3C® - - (MIT, - ERCIM, - Keio), - All Rights Reserved. - W3C liability, - trademark, - document use - - and software licensing - - rules apply. Your interactions with this site are in accordance - with our public and - Member privacy - statements. -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/about.html.es b/about.html.es index d725687b3..a908c2b9e 100644 --- a/about.html.es +++ b/about.html.es @@ -14,7 +14,7 @@

-

+

Servicio de Validación de CSS

Check Cascading Style Sheets (CSS) and (X)HTML documents with style sheets @@ -78,20 +78,20 @@ Puede utilizarse mediante este servicio gratuíto en la w Lo que hace esta herramienta es ayudar a las personas que escriben CSS a comprobar, y corregir si es necesario, sus Hojas de Estilo en Cascada.

De modo que, ¿ésto es lo que decide qué es CSS correcto y qué no lo es?

No. Es una herramienta útil y confiable, pero es una herramienta de software, y como todo software, tiene algunos -errores e incidencias & errores e incidencias. -La verdadera referencia sobre Hojas de Estilo en Cascada son las Especificaciones de CSS.

+errores e incidencias & errores e incidencias. +La verdadera referencia sobre Hojas de Estilo en Cascada son las Especificaciones de CSS.

¿Cuánto cuesta?

-

Nada. El servicio es gratis. El código fuente es abierto y eres libre de descargarlo, usarlo, modificarlo, distribuirlo y más. +

Nada. El servicio es gratis. El código fuente es abierto y eres libre de descargarlo, usarlo, modificarlo, distribuirlo y más. Si realmente te gusta, eres bienvenido a unirte al proyecto o hacer una donación al W3C a través del - programa de apoyo del W3C, pero nadie te obliga.

+ programa de apoyo del W3C, pero nadie te obliga.

¿Quién desarrolló esta herramienta? ¿Quién la mantiene?

El W3C mantiene y aloja la herramienta, gracias al trabajo y contribuciones del personal del W3C, desarrolladores y traductores voluntarios. Lee la página de créditos y reconocimientos para más detalles. Tú también puedes ayudar.

¿Puedo ayudar?

Por supueso. Si eres un programador java, puedes ayudar al proyecto del Validador CSS revisando el código, -adoptando y corrigiendo bugs & bugs, +adoptando y corrigiendo bugs & bugs, o ayudando a construir nuevas funciones.

Pero no necesitas ser un programador para ayudar a construir y mantener esta herramienta: también puedes ayudar a mejorar la documentación, participar en la traducción del validador a tu lenguaje, o suscribirte a la -lista de correo y discutir sobre la herramienta o ayudar a otros usuarios.

+lista de correo y discutir sobre la herramienta o ayudar a otros usuarios.

¿Alguna otra pregunta?

Si tienes alguna pregunta respecto a CSS o al validador de CSS, revisa los foros y listas de correo disponibles. Pero antes, asegúrate de que tu pregunta o comentario no está ya cubierto por el documento de Preguntas frecuentes del Validador CSS.

@@ -228,50 +228,19 @@ o seguir las instrucciones para descargar el árbol completo del código f - - - -

- - - - - +

- - + +

-

-Copyright © 1994-2009 - -W3C -® - - ( -MIT -, - -ERCIM -, - Keio), - All Rights Reserved. - W3C liability, - trademark, - document use - - and software licensing +

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

- rules apply. Your interactions with this site are in accordance - with our public and - Member privacy - statements. -

diff --git a/about.html.fa b/about.html.fa index 6de5a296c..e77559267 100644 --- a/about.html.fa +++ b/about.html.fa @@ -14,7 +14,7 @@

-

سرویس اعتبار سنجی CSS

+

سرویس اعتبار سنجی CSS

محک زدن شیوه نامه های آبشاری (CSS) و اسناد X)HTML) حاوی شیوه نامه ها

@@ -81,17 +81,17 @@

نه. این ابزاری سودمند و قابل اطمینان است، در عین حال یک ابزار نرم افزاری است و مشابه هر نرم افزار دیگری مشکلات -و اشکالاتی & مشکلات +و اشکالاتی & مشکلات و اشکالاتی دارد. -مرجع واقعی در شیوه نامه های آبشاری +مرجع واقعی در شیوه نامه های آبشاری خصوصیات CSS هستند.

قیمت آن چند است؟

هیچ. سرویس رایگان است. منبع باز است و شما می توانید رایگان آنرا دانلود نموده، از آن استفاده نمایید، آنرا اصلاح نموده، توزیع -کنید و غیره. +کنید و غیره. اگر شما واقعا آنرا می پسندید، جهت عضویت پروژه یا -اعطای هدیه به W3C از طریق برنامه ی +اعطای هدیه به W3C از طریق برنامه ی حامیان W3C، با آغوش باز پذیرای شما هستیم، اما کسی شما را مجبور به اهدای هدیه نمی کند.

چه کسی این ابزار را نوشت؟ چه کسی  آنرا پشتیبانی می کند؟

@@ -103,13 +103,13 @@ W3C، توسعه دهندگان و مترجم های داوطلب جای

می توانم کمک کنم؟

مطمئنا. اگر شما یک برنامه نویس جاوا هستید، می توانید با مورد بررسی قرار دادن کد، گزینش -اشکالات & اشکالات +اشکالات & اشکالات ثابت یا یاری در ایجاد ویژگی های جدید، به پروژه ی اعتبار سنج CSS کمک کنید.

اما شما جهت ایجاد و پشتیانی از این ابزار به وجود یک رمزگذار نیاز ندارید: همچنین شما می توانید با مشارکت جهت ترجمه ی اعتبار سنج به زبان خودتان یا اعلام آمادگی در -فهرست نامه های +فهرست نامه های فرستاده شده و بحث در مورد ابزار یا کمک به دیگر کاربران، کمک کنید مستند سازی بهتر شود.

@@ -216,56 +216,16 @@ CSS کمک کنید.

- +

-حمایت از این ابزار و تبدیل شدن به
- + + +

-

- کلیه - حقوق چاپ و نشر © 1994-2007 - - W3C ® برای - - (MIT, - - ERCIM, - Keio)، - محفوظ است. - W3C ، رعایت قوانین مربوط به - - مارک تجاری، - استفاده - از سند و - مجوز - استفاده نرم افزار را - - الزامی نموده است. تعامل شما با این سایت بر اساس بیانیه اختصاصی - - اعضا و - - گروه ما می باشد.
- Copyright © 1994-2007 - W3C® - - (MIT, - ERCIM, - Keio), - All Rights Reserved. - W3C liability, - trademark, - document use - - and software licensing - - rules apply. Your interactions with this site are in accordance - with our public and - Member - privacy statements -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/about.html.fr b/about.html.fr index 73f63f5ea..eaca83a27 100644 --- a/about.html.fr +++ b/about.html.fr @@ -15,7 +15,7 @@

-

+

Service de validation CSS

Check Cascading Style Sheets (CSS) and (X)HTML documents with style sheets @@ -68,14 +68,14 @@ Le validateur aide donc les créateurs CSS à vérifier et à réparer, le cas

C'est donc l'instance qui décide si le CSS est correct ou s'il ne l'est pas ?

Non. C'est un outil efficace et fiable, mais c'est un outil logiciel qui, comme tout logiciel, a des -bogues et des problèmes & bogues et des problèmes. -Les véritables références pour les feuilles de style en cascade sont les spécifications CSS.

+bogues et des problèmes & bogues et des problèmes. +Les véritables références pour les feuilles de style en cascade sont les spécifications CSS.

Combien ça coûte ?

Rien. Le service est gratuit. Le code source est ouvert et vous pouvez le télécharger, l'utiliser, -le modifier, le distribuer, et plus encore. +le modifier, le distribuer, et plus encore. Si vous l'appréciez vraiment, vous êtes invité à joindre le projet, ou vous pouvez faire un don au W3C -par le biais du programme de soutien du W3C, rien ne vous y oblige cependant.

+par le biais du programme de soutien du W3C, rien ne vous y oblige cependant.

Qui a écrit cet outil ? Qui l'entretient ?

Le W3C entretient et héberge l'outil, grâce au travail et aux contributions du personnel du W3C, et de développeurs @@ -84,11 +84,11 @@ et traducteurs bénévoles. Voir la pages des mentions et

Puis-je aider ?

Bien sûr. Si vous êtes un programmeur Java, vous pouvez contribuer au projet du validateur CSS en vérifiant le code, -en prenant les bogues & bogues à votre compte et en les réparant, +en prenant les bogues & bogues à votre compte et en les réparant, ou en y apportant de nouvelles fonctionnalités.

Mais il n'est pas nécessaire de programmer pour construire et entretenir cet outil : vous pouvez aussi contribuer en améliorant la documentation, en traduisant le validateur dans votre langue, ou vous inscrire à la -liste de diffusion et débattre au sujet de l'outil, +liste de diffusion et débattre au sujet de l'outil, ou encore aider d'autres utilisateurs.

D'autres questions ?

@@ -229,29 +229,17 @@ entre deux appels au validateur, ou alors installez et exécutez votre propre in

- +

- - + +

-

-Copyright © 1994-2009 -W3C® -(MIT, -ERCIM, -Keio), tous droits réservés. -Les règles de responsabilité, -de nom de marque, -d'utilisation des documents -et d'octroi de licences logicielles -du W3C s'appliquent. Vos interactions avec ce site sont conformes à nos déclarations de confidentialité -publiques et vis-à-vis -de nos membres. -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

+

diff --git a/about.html.hi b/about.html.hi index 177619ede..81814228c 100644 --- a/about.html.hi +++ b/about.html.hi @@ -17,7 +17,7 @@

-

+

सीएसएस मान्यकरण सेवा

कास्केडिंग शैली पत्रक (CSS) and (X)HTML दस्तावेजों शैली शीट्स @@ -83,21 +83,21 @@ सॉफ्टवेयर की तरह और, यह कुछ क़ी मुददा - & कुछ + & कुछ क़ी मुददा है शैली पत्रक कास्केडिंग पर वास्तविक संदर्भ - सीएसएस निर्दिष्टीकरण हैं.

+ सीएसएस निर्दिष्टीकरण हैं.

मान्य सीएसएस का क्या मतलब है? यह मान्यकर्ता कौन से सीएसएस संस्करण में का उपयोग करता है?

- + सीएसएस 2.1 विनिर्देश के अनुसार: एक शैली पत्रक की वैधता शैली पत्रक के लिए इस्तेमाल किया सीएसएस के स्तर पर निर्भर करता है. [...] मान्य सीएसएस 2,1 शैली पत्रक 2.1 सीएसएस के व्याकरण के हिसाब से लिखा होना चाहिए. इसके अलावा, यह केवल पर, नियम, संपत्ति के नाम, और संपत्ति मूल्यों इस विनिर्देशन में परिभाषित होना चाहिए.

डिफ़ॉल्ट रूप से, व्याकरण के खिलाफ इस मान्यकर्ता चेक शैली पत्रक, गुण और - + सीएसएस 2.1 विनिर्देश में परिभाषित किया गया है लेकिन अन्य सीएसएस प्रोफाइल विकल्पों के खिलाफ प्रयोग करके के जाँच की जा सकती.

सीएसएस एक विकसित भाषा है, और यह द्वारा कई कि "सीएसएस" गुण और स्वीकार्य विभिन्न @@ -109,9 +109,9 @@

इस में कितना खर्च आता है?

कुछ नहीं. सेवा मुफ़्त है. स्रोत खुला है और आप इसे डाउनलोड करने के लिए स्वतंत्र हैं, इसका इस्तेमाल संशोधित, वितरित करने - , इसे और अधिक + , इसे और अधिक . तुम सच में इसे तरह अगर, आप के लिए परियोजना में शामिल - होने का स्वागत कर रहे हैं या + होने का स्वागत कर रहे हैं या W3C समर्थकों कार्यक्रम है ,इस के माध्यम से W3C दान करने के लिए, लेकिन कोई भी तुमहे बलों को.

कौन इस उपकरण को लिखा? रख रखाव करता है?

@@ -124,12 +124,12 @@ जाँच द्वारा सीएसएस मान्यकर्ता परियोजना मदद, अपनाने और कीड़े फिक्सिंग - & कीड़े + & कीड़े फिक्सिंग, या नई सुविधाओं के निर्माण में मदद कर सकते हैं.

लेकिन आप एक मदद करने के लिए इस उपकरण का निर्माण और बनाए रखने के लिए सांकेतिक शब्दों में बदलनेवाला की आवश्यकता नहीं है: क्या आप भी मदद कर सकते है प्रलेखन में सुधार अपनी भाषा, या - मेलिंग सूची + मेलिंग सूची की सदस्यता में मान्यकर्ता के अनुवाद में भाग लेने के लिए और उपकरण या अन्य उपयोगकर्ताओं की मदद के बारे में चर्चा.

किसी भी अन्य प्रश्न?

@@ -214,30 +214,13 @@

- - +

-

- +

+

-

- - Copyright © 1994-2009 - W3C® (MIT, - - - ERCIM, Keio), All Rights - Reserved. W3C - liability, - trademark, - - document use and - - software licensing rules apply. Your interactions with this site are in - accordance with our - public - and Member - privacy statements.

+ +

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/about.html.it b/about.html.it index d2cdf1122..414607d38 100644 --- a/about.html.it +++ b/about.html.it @@ -16,7 +16,7 @@

-

+

Servizio di validazione CSS

Check Cascading Style Sheets (CSS) and (X)HTML documents with style sheets @@ -64,21 +64,21 @@ Può essere utilizzato sia tramite questo servizio gratuito dis

Allora questa è l'autorità che giudica se un CSS è corretto oppure se non lo è?

No. Questo strumento è senz'altro di grande aiuto ma è un'applicazione software e come ogni software incorre in -problemi e necessità di implementazioni aggiuntive & problemi e necessità di implementazioni aggiuntive. -Il riferimento attuale per i fogli di stile a cascata sono le Specifiche CSS.

+problemi e necessità di implementazioni aggiuntive & problemi e necessità di implementazioni aggiuntive. +Il riferimento attuale per i fogli di stile a cascata sono le Specifiche CSS.

Quanto costa?

-

Nulla. Il servizio è gratuito. Il sorgente è disponibile è sei libero di scaricarlo, utilizzarlo, modificarlo, distribuirlo e molto altro. +

Nulla. Il servizio è gratuito. Il sorgente è disponibile è sei libero di scaricarlo, utilizzarlo, modificarlo, distribuirlo e molto altro. Se realmente il prodotto ti piace, sei il benvenuto ad accedere al progetto oppure donando al W3C tramite il - Programma di supporto del W3C, ma nessuno ti obbliga a farlo.

+ Programma di supporto del W3C, ma nessuno ti obbliga a farlo.

Chi ha scritto questo strumento? E chi lo mantiene?

Il W3C mantiene ed ospita questo strumento, grazie al lavoro ed al contributo dello staff del W3C e all'attività volontaria di supporto di sviluppatori e traduttori. Consulta la pagina dei crediti e riconoscimenti per maggiori dettagli. Se lo desideri, puoi anche aiutarci.

Posso aiutarvi?

-

Certamente. Se sei uno sviluppatore java puoi aiutare il progetto del Validatore CSS analizzando il codice, selezionando e risolvendo problemi & problemi, oppure aiutando a sviluppare nuove caratteristiche.

+

Certamente. Se sei uno sviluppatore java puoi aiutare il progetto del Validatore CSS analizzando il codice, selezionando e risolvendo problemi & problemi, oppure aiutando a sviluppare nuove caratteristiche.

Comunque non è necessario essere dei programmatori per aiutare a sviluppare e a mantenere questo strumento: puoi anche partecipare allo sviluppo della documentazione, partecipare alla traduzione del validatore nella tua lingua oppure partecipare alla -lista di discussione relativa allo strumento di validazione dei CSS aiutando gli altri utenti.

+lista di discussione relativa allo strumento di validazione dei CSS aiutando gli altri utenti.

Come posso contattare gli autori? E segnalare un problema?

Se hai qualsiasi domanda riguardo i CSS o il validatore dei CSS, consulta prima le @@ -209,29 +209,16 @@ Se realmente il prodotto ti piace, sei il benvenuto ad ac

- +

- - + +

-

- Copyright © 1994-2009 - W3C® - - (MIT, - ERCIM, - Keio), - Tutti i diritti riservati. - Si applicano le regole del W3C riguardanti la responsabilità, - marchi depositati, - l'utilizzo dei documenti - - e le licenze software. L'interazione con i contenuti di questi siti è in accordo con le nostre definizioni di pubblico e privato per quanto riguarda la riservatezza delle informazioni. -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/about.html.ja b/about.html.ja index 7980f678a..782086473 100644 --- a/about.html.ja +++ b/about.html.ja @@ -15,7 +15,7 @@

-

+

CSS 検証サービス

Check Cascading Style Sheets (CSS) and (X)HTML documents with style sheets @@ -71,15 +71,15 @@

つまり、これは CSS が正しいかどうかについて検査する「権威」なわけですね?

違います。 -確かにこれは便利で信頼できるツールですが、他のどんなソフトウェアもそうであるように、ソフトウェアである以上はバグと問題&バグと問題があるかもしれません。 -カスケーディング・スタイルシートの絶対的な参考文献は、CSS の仕様書です。

+確かにこれは便利で信頼できるツールですが、他のどんなソフトウェアもそうであるように、ソフトウェアである以上はバグと問題&バグと問題があるかもしれません。 +カスケーディング・スタイルシートの絶対的な参考文献は、CSS の仕様書です。

「正当な CSS」つてどういう意味？　どの CSS のバージョンを使ったの？

-

CSS 2.1 仕様「3. 適合性」によれば、スタイルシートの正当性はスタイルシートに使用されるCSSのレベルに依存します。 … 正当な CSS 2.1 スタイルシートは CSS 2.1 の文法にしたがって書かなければなりません。また、この仕様で定義された、@規則、プロパティ名、およびその値だけを含まなければなりません。

-

デフォルトでは、

デフォルトでは、CSS 2.1 仕様に定義された、文法、プロパティ名、および値に対してスタイルシートを検証しますが、この検証ツールは、オプションを使用して、他のレベルの CSS をチェックできます。

CSS は発展している言語です、そして、多くの人が「CSS」は(最新の仕様に基づき定義された)ただ一つの文法であり、多くのプロパティがあり、プロファイルごとに許容値が様々であると思っています。この検証ツールの将来のバージョンでは、デフォルトでその最新の「CSS文法」と数多の標準化されたCSSのプロパティ名と値に対してスタイルシートをチェックするようになるかもしれません。

@@ -87,8 +87,8 @@ title="Cascading Style Sheets Level 2 Revision 1 (CSS 2.1) Specification">C

使うのにいくらかかるの?

費用はかかりません。 これは無償のサービスです。 -ソースはオープンで、自由にダウンロード・利用・修正・配布などすることができます (その他様々な使い方ができます)。 -もしこのツールを気に入っていただけたのなら、このプロジェクトに参加したり、W3Cサポーター・プログラムを使って W3C に寄付活動をすることができます。が、それは一切強制されるものではありません。

+ソースはオープンで、自由にダウンロード・利用・修正・配布などすることができます (その他様々な使い方ができます)。 +もしこのツールを気に入っていただけたのなら、このプロジェクトに参加したり、W3Cサポーター・プログラムを使って W3C に寄付活動をすることができます。が、それは一切強制されるものではありません。

誰が作ったの? 誰が管理しているの?

@@ -99,8 +99,8 @@ W3C がツールを管理・ホスティングしています。

何か手伝えることは?

もちろん。 -Java プログラマなら、CSS 検証サービスプロジェクトのコードをチェック・選別してバグ&バグを修正したり、新機能の構築を手伝っていただければ助かります。

-

しかし、このツールの構築・運営に必要とされているのはプログラマだけではありません。文書を改良したり、CSS 検証サービスをあなたの言語に翻訳するのを手伝ったり、メーリングリストに参加して議論したり他の参加者を手助けするのも、また大きな支援となります。

+Java プログラマなら、CSS 検証サービスプロジェクトのコードをチェック・選別してバグ&バグを修正したり、新機能の構築を手伝っていただければ助かります。

+

しかし、このツールの構築・運営に必要とされているのはプログラマだけではありません。文書を改良したり、CSS 検証サービスをあなたの言語に翻訳するのを手伝ったり、メーリングリストに参加して議論したり他の参加者を手助けするのも、また大きな支援となります。

作者にコンタクトをとるには? バグを報告するには?

CSS や CSS 検証サービスについての質問があるなら、メーリングリストやフォーラムを見てください。でもその前に、あなたの質問やコメントがすでに CSS 検証サービスFAQ に登録されていないことを確認してください。

@@ -230,35 +230,18 @@ CSS 検証サービスには、平和的 (RESTful) な SOAP - -

- +

- - + +

-

- Copyright © 1994-2009 - W3C® - - (MIT, - ERCIM, - 慶應義塾大学), - All Rights Reserved. - W3C の責任範囲、 - 商標、 - 文書の利用、 - そしてライセンス - の規則が適用されます。 - このサイトの訪問者は、私たちの一般およびメンバープライバシー声明に従うものとします。 - -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/about.html.ko b/about.html.ko index 0403fd9c4..f9c864b8e 100644 --- a/about.html.ko +++ b/about.html.ko @@ -15,7 +15,7 @@

-

+

CSS 검사 서비스

캐스케이딩 스타일시트 (CSS)와 스타일시트를 포함한 문서를 검사 @@ -69,15 +69,15 @@

요약하자면 어떤 CSS가 올바른지 올바르지 않은지 평가할 수 있는 절대적인 기준이라는 말이군요?

그렇지는 않습니다. 비록 비교적 안정적인 도구이지만, 모든 소프트웨어가 그렇듯 이 검사 도구 -역시 소프트웨어인 만큼 버그와 문제점이 & 버그와 문제점이 -있습니다. 절대적인 기준이 필요할 경우에는 CSS 표준 문서를 +역시 소프트웨어인 만큼 버그와 문제점이 & 버그와 문제점이 +있습니다. 절대적인 기준이 필요할 경우에는 CSS 표준 문서를 참고하면 됩니다.

이용료나 가격 정책은 어떻게 되나요?

본 서비스는 무료로 제공하고 있습니다. 소스 코드 또한 공개되어 있으며, -자유롭게 다운로드 받아 수정, 재배포, 사용할 수 있도록 정책이 +자유롭게 다운로드 받아 수정, 재배포, 사용할 수 있도록 정책이 되어 있습니다. 만일 이 도구가 유용하게 쓰이고 도움을 제공하고 싶다면 프로젝트의 멤버가 되거나 -W3C의 서포터즈 프로그램을 통하여 기부할 수 있습니다.

+W3C의 서포터즈 프로그램을 통하여 기부할 수 있습니다.

이 도구는 누가 만들었으며, 유지가 되고 있나요?

현재 W3C를 중심으로 W3C 스텝과 자원 개발자, 그리고 번역자들에 의해 이 도구를 유지 보수하고 있으며 @@ -86,11 +86,11 @@ W3C의 서포터즈 프로그램

참여할 수 있는 방법이 있나요?

물론입니다. 만일 자바 프로그래밍이 가능하다면, 소스 코드 체크 아웃을 하고 -현재 알려진 버그 또는 문제점을 & 버그 또는 문제점을 +현재 알려진 버그 또는 문제점을 & 버그 또는 문제점을 수정하거나 새로운 기능을 추가하는데 도움을 주는 방법으로 참여할 수 있습니다.

하지만 참여를 위해서 반드시 프로그래밍 능력이 필요한 것은 아닙니다. 서비스의 설명서와 같은 문서를 개선하거나 -번역 작업으로 참여를 할 수 있으며, 메일링 리스트를 +번역 작업으로 참여를 할 수 있으며, 메일링 리스트를 통하여 의견을 나누거나 다른 사용자들의 질문에 답하는 것만으로도 참여할 수 있습니다.

여기서 다루어지지 않은 궁금한 점은 어디에 물어보면 되나요?

@@ -223,34 +223,16 @@ CSS 검사 도구에서 사용하는 클래스에 대한 개괄적인 설명은

- +

- - + +

-

- Copyright © 1994-2007 - W3C® - - (MIT, - ERCIM, - Keio), - All Rights Reserved. - W3C liability, - trademark, - document use - - and software licensing - - rules apply. Your interactions with this site are in accordance - with our public and - Member privacy - statements. -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/about.html.nl b/about.html.nl index 578f1ae24..c832a34d0 100644 --- a/about.html.nl +++ b/about.html.nl @@ -16,7 +16,7 @@

-

+

CSS Validation Service

Check Cascading Style Sheets (CSS) and (X)HTML documents with style sheets @@ -74,16 +74,16 @@ Deze tool helpt mensen die zich bezig houden met het ontwikkelen van webpagina's

Dus deze service bepaalt wat wel of geen correct CSS is?

Nee. Het is een helpvolle en betrouwbare tool, maar het blijft software, en zoals elk stuk software heeft de validator een aantal -bugs en problemen & legacy bugs en problemen. -De echte referentie over Cascading Style Sheets zijn de officiële CSS +bugs en problemen & legacy bugs en problemen. +De echte referentie over Cascading Style Sheets zijn de officiële CSS Specificaties.

Wat kost dit mij?

Niets. De service is gratis. De broncode is open en je bent vrij om de code te downloaden, te gebruiken, te wijzigen, te verspreiden -en meer. +en meer. Verder ben je, als je dat wilt, welkom om mee te werken aan dit project of om te doneren aan het W3C via het - W3C supporters programma.

+ W3C supporters programma.

Wie heeft deze tool geschreven? En wie onderhoudt hem?

@@ -93,11 +93,11 @@ voor details. Ook jij kunt helpen.

Kan ik helpen?

Natuurlijk, graag zelfs! Als je een java programmeur bent kun je meehelpen aan het CSS Validator project door -de broncode op te halen en te helpen bij het oplossen van bugs & legacy bugs, +de broncode op te halen en te helpen bij het oplossen van bugs & legacy bugs, of door het helpen bij het implementeren van nieuwe functies.

Maar je hoeft niet perse een coder te zijn om te helpen bij het bouwen en onderhouden van deze tool: je kunt ook helpen de documentatie te verbeteren, mee te werken door de validator in jouw taal te vertalen, of door je aan te melden bij de -mailing-list en te discussiëren over de tool of anderen te helpen.

+mailing-list en te discussiëren over de tool of anderen te helpen.

Heb je verder nog vragen?

Mocht je verder nog vragen hebben over CSS of de CSS validator, bekijk dan even de beschikbare @@ -230,39 +230,19 @@ of installeer en draai je eigen instantie van de validator.

-

- +

- - + +

-

- - Copyright © 1994-2009 - W3C® - - (MIT, - ERCIM, - Keio), - Alle Rechten Voorbehouden. - W3C aansprakelijkheid, - handelsmerk, - document gebruik - - en de software licentie - - regels zijn van toepassing. Je interacties met deze site zijn in overeenstemming - met onze publieke en - Member privacy - verklaringen. -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/about.html.pl-PL b/about.html.pl-PL index afb9b88cf..fd8d343ef 100644 --- a/about.html.pl-PL +++ b/about.html.pl-PL @@ -16,7 +16,7 @@

-

+

Usługa Walidacji CSS

Check Cascading Style Sheets (CSS) and (X)HTML documents with style sheets @@ -63,12 +63,12 @@ Można z niego korzystać w sieci dzięki naszej darmowej usłudze<

Większość dokumentów internetowych napisana jest w języku zwanym HTML. Język ten jest używany do tworzenia stron internetowych zawierających informacje dotyczące struktury, linków i obiektów multimedialnych. HTML korzysta z języka stylów nazwanego CSS, skrót od "Cascading Style Sheets", do formatowania koloru, tekstu i layoutu dokumentów. Narzędzie nasze pomaga ludziom w sprawdzaniu poprawności CSS i ewentualnym poprawkom arkuszy stylów.

Czy walidator jest wyznacznikiem tego co jest poprawnym dokumentem CSS, a co nie jest?

-

Nie. Jest pomocnym i przydatnym narzędziem, ale jedynie programem i jak każdy program ma pewne błędy i problemy & błędy i problemy. -Właściwymi referencjami odnośnie Kaskadowych Arkuszy Stylów są specyfikacje CSS.

+

Nie. Jest pomocnym i przydatnym narzędziem, ale jedynie programem i jak każdy program ma pewne błędy i problemy & błędy i problemy. +Właściwymi referencjami odnośnie Kaskadowych Arkuszy Stylów są specyfikacje CSS.

Ile to kosztuje?

-

Nic. Usługa jest darmowa. Program posiada otwarty dostęp do kodu źródłowego i można go ściągnąć za darmo, używać, modyfikować, rozprowadzać i o wiele więcej. -Jeśli Ci się on podoba, zachęcamy do przyłączenia się do projektu lub wsparcia finansowego W3C poprzez W3C supporters program, ale nie jest to obligacją.

+

Nic. Usługa jest darmowa. Program posiada otwarty dostęp do kodu źródłowego i można go ściągnąć za darmo, używać, modyfikować, rozprowadzać i o wiele więcej. +Jeśli Ci się on podoba, zachęcamy do przyłączenia się do projektu lub wsparcia finansowego W3C poprzez W3C supporters program, ale nie jest to obligacją.

Kto jest autorem tego narzędzia? Kto je utrzymuje?

W3C utrzymuje i jest gospodarzem tego narzędzia dzięki pracy i wkładzie personelu W3C oraz ochotników takich jak deweloperzy i tłumacze. @@ -77,9 +77,9 @@ po więcej szczegółów. Ty również możesz pomóc

Czy mogę pomóc?

Oczywiście. Jeśli jesteś programistą(ką) w języku Java, możesz pomóc w Projekcie Walidatora CSS poprzez sprawdzanie kodu, -usuwanie błędów & błędów +usuwanie błędów & błędów lub budowanie nowych funkcji.

-

Nie musisz być jednak programistą, aby pomóc w budowaniu i utrzymywaniu tego narzędzia: możesz również pomagać przy polepszaniu dokumentacji, tłumaczeniu Walidatora na inne języki lub poprzez wpisanie się na naszą listę mailingową w celu prowadzenia dyskusji na temat tego programu lub pomocy innym użytkownikom tego narzędzia.

+

Nie musisz być jednak programistą, aby pomóc w budowaniu i utrzymywaniu tego narzędzia: możesz również pomagać przy polepszaniu dokumentacji, tłumaczeniu Walidatora na inne języki lub poprzez wpisanie się na naszą listę mailingową w celu prowadzenia dyskusji na temat tego programu lub pomocy innym użytkownikom tego narzędzia.

Inne pytania?

Jeśli masz jakiekolwiek pytania odnośnie CSS i walidatora CSS, sprawdź dostępne listy mailingowe i fora. Zanim to jednak uczynisz, upewnij się, czy jest już odpowiedź na twoje pytanie w dokumencie najczęściej zadawanych pytań na temat walidatora CSS.

@@ -216,34 +216,16 @@ lub ściągnąć go według zamieszczonych instrukcji. Po szybki przegląd klas

- +

- - + +

-

- Copyright © 1994-2009 - W3C® - - (MIT, - ERCIM, - Keio), - All Rights Reserved. - W3C liability, - trademark, - document use - - and software licensing - - rules apply. Your interactions with this site are in accordance - with our public and - Member privacy - statements. -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/about.html.pt-BR b/about.html.pt-BR index 5cb4450d9..2abac173c 100644 --- a/about.html.pt-BR +++ b/about.html.pt-BR @@ -15,7 +15,7 @@

-

+

Serviço de validação CSS

Verifica folhas de estilo em cascata (CSS) e documentos (X)HTML com folhas de estilo

@@ -62,13 +62,13 @@ A finalidade da ferramenta validador CSS é a de auxiliar o desenvolvedor na tar

Então, essa é a autoridade que determina se a CSS está ou não correta?

Não. É apenas uma ferramenta valiosa e confiável, ressalvado que, sendo uma ferramenta baseada em um software, está sujeita a -bugs e incorreções & legacy bugs e incorreções . -A referência atual para folhas de estilo é a especificação para CSS.

+bugs e incorreções & legacy bugs e incorreções . +A referência atual para folhas de estilo é a especificação para CSS.

Quanto custa ?

-

Nada. O serviço é gratuito. O código é aberto e você é livre para baixar, usar, modificar, distribuir e muito mais. +

Nada. O serviço é gratuito. O código é aberto e você é livre para baixar, usar, modificar, distribuir e muito mais. Se você gosta do validador está convidado a participar do seu projeto ou fazer uma doação ao W3C via o - programa de suporte ao W3C, mas isto não é uma obrigatoriadade.

+ programa de suporte ao W3C, mas isto não é uma obrigatoriadade.

Quem escreveu o código dessa ferramenta ? Quem a mantém?

O W3C mantém, hospeda a ferramenta e agradece o trabalho do staff do W3C, aos desenvolvedores voluntários e tradutores. Ver a página de créditos e agradecimentos @@ -76,10 +76,10 @@ para maiores detalhes. Você pode participar.

Posso ajudar ?

Certamente que sim . Se você é um programador java você pode ajudar a desenvolver o projeto do validador conferindo o código, -analisando e corrigindo bugs & legacy bugs, +analisando e corrigindo bugs & legacy bugs, ou criando novas funcionalidades.

Mas, você não precisa ser um programador para manutenir e aperfeiçoar essa ferramenta: você pode ajudar na melhoria da documentação, participar de traduções do validador ou mesmo se inscrever na -lista de discussão para participar das discussões e ajudar usuários com dúvidas.

+lista de discussão para participar das discussões e ajudar usuários com dúvidas.

Ficou alguma dúvida ?

Se você tem alguma dúvida sobre CSS ou validador CSS consulte as @@ -214,34 +214,16 @@ que torna bem simples a tarefa de construir uma aplicação (seja web ou outra q

- +

- - + +

-

- Copyright © 1994-2007 - W3C® - - (MIT, - ERCIM, - Keio), - All Rights Reserved. - W3C liability, - trademark, - document use - - and software licensing - - rules apply. Your interactions with this site are in accordance - with our public and - Member privacy - statements. -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/about.html.ro b/about.html.ro index 57648cee9..f9196b2ba 100644 --- a/about.html.ro +++ b/about.html.ro @@ -15,7 +15,7 @@

-

+

Serviciul de validare CSS

Verifica Foile de stil in cascada (CSS) si documentele (X)HTML care folosesc foi de stil @@ -62,23 +62,23 @@

Deci, aceasta este instanta in masura sa decida daca un CSS este corect sau nu?

Nu. Este un serviciu de incredere, dar, ca orice alt software, are -erori si probleme & erori si probleme. -Referintele exacte despre foile de lucru in cascada sunt Specificatiile CSS.

+erori si probleme & erori si probleme. +Referintele exacte despre foile de lucru in cascada sunt Specificatiile CSS.

Ce inseamna un "CSS valid"? Ce versiune de CSS foloseste acest validator?

-

Conform

Conform Specificatia CSS 2.1 : validitatea unei foi de lucru depinde de nivelul de CSS folosit pentru respectiva foaie de lucru. […] Foaia de lucru CSS 2.1 valida trebuie sa fie scrisa potrivit gramaticii CSS 2.1. Pe langa acestea, trebuie sa contina numai regulile, numele proprietatilor, si valorile proprietatilor definite in aceasta specificatie.

In mod automat, acest validator verifica foile de lucru pentru toate acestea definite in specificatiile -CSS 2.1 dar alte profiluri CSS pot fi verificate si dupa alte optiuni

CSS este un limbaj evolutiv, si sunt multi care considera ca "CSS" are o gramatica singulara (cea definita in ultima specificatie) cu un numar de proprietati si valori acceptabile definite in profiluri variate. Versiunile viitoare ale acestui validator ar putea verifica daca foile de lucru corespund ultimelor standarde CSS.

Cat costa?

-

Nimic. E gratuit. Sursa este aici si poate fi descarcata, folosita, modifcata, distribuita si multe altele. -Daca iti place cu adevarat, poti sa participi la proiect sau sa donezi pentru W3C prin programul de sustinere W3C, dar nu esti obligat.

+

Nimic. E gratuit. Sursa este aici si poate fi descarcata, folosita, modifcata, distribuita si multe altele. +Daca iti place cu adevarat, poti sa participi la proiect sau sa donezi pentru W3C prin programul de sustinere W3C, dar nu esti obligat.

Cine a conceput acest serviciu? Cine il administreaza?

W3C gazduieste si administreaza acest serviciu, gratie muncii si contributiilor personalului W3C, dezvoltatorilor voluntari si translatorilor. Daca vrei, poti afla mai multe despre Multumiri si aprecieri @@ -86,8 +86,8 @@ Daca iti place cu adevarat, poti sa participi la proiect<

Pot ajuta?

Desigur, Daca esti programator java, poti ajuta proiectul Validator CSS prin verificarea codului, -adoptarea si repararea erorilor & erorilor, sau poti ajuta sa construim noi elemente.

-

Deasemenea poti ajuta la imbunatatirea documentatiei, participand la traducerea validatorului in limba ta materna, sau sa te inscrii in lista de discutii si sa dezbati despre acest serviciu, sau sa-i ajuti pe altii.

+adoptarea si repararea erorilor & erorilor, sau poti ajuta sa construim noi elemente.

+

Deasemenea poti ajuta la imbunatatirea documentatiei, participand la traducerea validatorului in limba ta materna, sau sa te inscrii in lista de discutii si sa dezbati despre acest serviciu, sau sa-i ajuti pe altii.

Alte intrebari?

Daca mai ai alte intrebari despre CSS sau despre validatorul CSS, verifica lista de discutii si formuri. Dar inainte, verifica ca intrebarea sau comentariul tau sa nu fie deja acoperite de CSS Validator @@ -217,44 +217,19 @@ adoptarea si repararea ero - - - - - - -

- +

- - + +

-

- Copyright © 1994-2009 - W3C® - - (MIT, - ERCIM, - Keio), - All Rights Reserved. - W3C liability, - trademark, - document use - - and software licensing - - rules apply. Your interactions with this site are in accordance - with our public and - Member privacy - statements. -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/about.html.ru b/about.html.ru index 3750ced19..f45889b15 100644 --- a/about.html.ru +++ b/about.html.ru @@ -15,7 +15,7 @@

-

+

Сервис проверки CSS

Проверка таблиц каскадных стилей (CSS) и документов (X)HTML с таблицами стилей @@ -60,18 +60,18 @@

Большинство документов в сети написаны на компьютерном языке HTML. Он может быть использован для создания страниц со структурированной информацией, ссылками, мультимедийными объектами. Для цветов, шрифтов и верстки HTML использует язык описания стилей CSS («Cascade Style Sheets», «каскадные таблицы стилей»). Этот сервис позволяет людям проверить написанные ими таблицы стилей и, если потребуется, внести в них изменения.

Это официальная проверка на корректность CSS?

-

Нет. Это надежная и полезная утилита, но это всего лишь программа, и, как у любого программного обеспечения, у нее есть ошибки и проблемы & ошибки и проблемы. Актуальный справочник по таблицам каскадных стилей есть в их спецификации.

+

Нет. Это надежная и полезная утилита, но это всего лишь программа, и, как у любого программного обеспечения, у нее есть ошибки и проблемы & ошибки и проблемы. Актуальный справочник по таблицам каскадных стилей есть в их спецификации.

Сколько это стоит?

-

Нисколько, это бесплатный сервис. Исходный код открыт, и вы можете свободно загрузить его, использовать, модифицировать, распространять — делать с ним что угодно. -Если этот сервис нравится вам, то вы можете присоединиться к проект или добровольно спонсировать W3C через программу поддержки, но никто не заставляет вас это делать.

+

Нисколько, это бесплатный сервис. Исходный код открыт, и вы можете свободно загрузить его, использовать, модифицировать, распространять — делать с ним что угодно. +Если этот сервис нравится вам, то вы можете присоединиться к проект или добровольно спонсировать W3C через программу поддержки, но никто не заставляет вас это делать.

Кто написал это приложение? Кто его поддерживает?

Данный сервис размещается и обслуживается на сервере W3C, благодаря вкладу и работе членов W3C, добровольных разработчиков и переводчиков. Для подробной информации смотрите страницу создателей и участников. Вы также можете внести свой вклад.

Могу ли я помочь?

-

Конечно. Если вы программируете на Java, то можете помочь проекту, проверяя, улучшая, исправляя & исправляя исходный код, либо добавляя новые функции.

-

Для помощи в разработке и поддержке вам не обязательно быть программистом — вы можете помочь улучшить документацию, перевести интерфейс на свой язык или подписаться на лист рассылки для обсуждения сервиса и помощи другим пользователям.

+

Конечно. Если вы программируете на Java, то можете помочь проекту, проверяя, улучшая, исправляя & исправляя исходный код, либо добавляя новые функции.

+

Для помощи в разработке и поддержке вам не обязательно быть программистом — вы можете помочь улучшить документацию, перевести интерфейс на свой язык или подписаться на лист рассылки для обсуждения сервиса и помощи другим пользователям.

Есть еще вопросы?

Если у вас возникли вопросы по CSS или сервису проверки CSS, задайте их в доступных @@ -198,39 +198,19 @@ - -

- +

- - + +

-

- Copyright © 1994-2007 - W3C® - - (MIT, - ERCIM, - Keio), - All Rights Reserved. - W3C liability, - trademark, - document use - and software licensing - - rules apply. Your interactions with this site are in accordance - with our public and - Member privacy - statements. -

- +

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/about.html.sv b/about.html.sv index e9a906d67..27291fae4 100644 --- a/about.html.sv +++ b/about.html.sv @@ -15,7 +15,7 @@

-

+

CSS valideringstjänst

Granska formatmallar ("Check Cascading Style Sheets, CSS) och (X)HTML-dokument med formatmallar @@ -94,10 +94,10 @@ CSS och vid skapandet av CSS formatmallar. Nej. Det är ett verktyg, hjälpande och tillförlitligt, men ändå ett programvaruverktyg, och som all annan programvara så har den några -fel och brister & fel och brister. +fel och brister & fel och brister. Den sanna måttstocken för CSS-formatmallar är -CSS specifikationerna. +CSS specifikationerna.

@@ -108,12 +108,12 @@ Den sanna måttstocken för CSS-formatmallar är Ingenting. Tjänsten är gratis. Källkoden är öppen, och du kan ladda ned den, använda den, modifiera den, distribuera den och -annat. +annat. Om du skulle vilja, så kan du deltaga i detta projekt eller donera till W3C via - W3C:s supperterprogram. + W3C:s supperterprogram.

@@ -138,7 +138,7 @@ Naturligtvis. Om du är Javaprogrammerare, så kan du hjälpa projektet CSS-valideraren genom att granska koden, diagnosticera och rätta -fel & fel, +fel & fel, eller att hjälpa till med att konstruera ny funktionalitet.

@@ -147,7 +147,7 @@ Men du behöver inte vara en kodare för att hjälpa till i arbetet med att bygga och underhålla detta verktyg; du kan också hjälpa till med att förbättra dokumentation, översätta valideraren till ditt språk, eller prenumerera på -dess epostlista +dess epostlista och diskutera verktyget och hjälpa andra användare.

@@ -331,33 +331,16 @@ installera din egen instans av valideraren.

- +

- - + +

-

- Copyright © 1994-2007 - W3C® - - (MIT, - ERCIM, - Keio), - Rättigheter förbehållna. - W3C:s regler för - ansvar, - varumärke, - dokumentanvändning - och - programvarulicenser gäller. - Din interaktion med denna webbplats sker i enlighet med våra integritetspolicies för - allmänheten och - W3C:s medlemmar. -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/about.html.uk b/about.html.uk index 5a061f125..0dd3b6577 100644 --- a/about.html.uk +++ b/about.html.uk @@ -15,7 +15,7 @@

-

+

Сервіс перевірки CSS

Перевірка таблиц каскадних стилів (CSS) і документів (X)HTML з таблицями стилів @@ -60,18 +60,18 @@

Більшість документів у Сіті написано комп'ютерною мовою HTML. Її може бути використано для створення сторінок зі структурованою інформаціею, посиланнями, мультимедійними об'єктами. Для кольорів, шрифтів та верстки HTML використовує мову описання стилів CSS («Cascade Style Sheets», «каскадні таблиці стилів»). Цей сервіс дозволяє людям перевіряти написані ними таблиці стилів і, якщо знадобиться, вводити до них змінення.

Чи це офіційна перевірка на коректність CSS?

-

Ні. Це надійна й корисна утиліта, але це лише програма, та, як і будь-яке програмне забезпечення, вона має помилки й проблеми & помилки й проблеми. Актуальний довідник по таблицях каскадних стилів є в спеціфікації.

+

Ні. Це надійна й корисна утиліта, але це лише програма, та, як і будь-яке програмне забезпечення, вона має помилки й проблеми & помилки й проблеми. Актуальний довідник по таблицях каскадних стилів є в спеціфікації.

Скільки це коштує?

-

Аніскільки, це безплатний сервіс. Програмний код є відкритим, і ви можете вільно завантажити його, використати, модіфікувати, поширювати — робити з ним що завгодно. -Якщо цей сервіс подобається вам, то ви можете долучитися до проекту або добровільно спонсувати W3C через програму підтримки, проте ніхто не примушує вас це робити.

+

Аніскільки, це безплатний сервіс. Програмний код є відкритим, і ви можете вільно завантажити його, використати, модіфікувати, поширювати — робити з ним що завгодно. +Якщо цей сервіс подобається вам, то ви можете долучитися до проекту або добровільно спонсувати W3C через програму підтримки, проте ніхто не примушує вас це робити.

Хто написав цей застосунок? Хто його підтримує?

Даний сервіс розміщується й обслуговується на сервері W3C, завдяки внеску та праці членів W3C, добровільних розробників і перекладачів. Для докладної інформації дивіться сторінку створювачів і учасників. Ви також можете зробити свій внесок.

Чи можу я допомогти?

-

Звісно. Якщо ви програмуєте на Java, то можете допомогти проекту, перевірюючи, покращуючи, виправляючи & виправляючи початковий код, або додаючи нові функції.

-

Для допомоги у розробці й підтримці вам не обов'язково бути програмістом — ви можете допомогти покращити документацію, перекласти інтерфейс на свою мову або підписатися на лист розсилання для обговорення сервісу та допомоги іншим користувачам.

+

Звісно. Якщо ви програмуєте на Java, то можете допомогти проекту, перевірюючи, покращуючи, виправляючи & виправляючи початковий код, або додаючи нові функції.

+

Для допомоги у розробці й підтримці вам не обов'язково бути програмістом — ви можете допомогти покращити документацію, перекласти інтерфейс на свою мову або підписатися на лист розсилання для обговорення сервісу та допомоги іншим користувачам.

Чи є ще питання?

Якщо у вас постають питання по CSS або сервісу перевірки CSS, задайте їх у доступних @@ -149,32 +149,16 @@

- +

-

Підтримайте проект — внесіть пожертву.
- +

+ + +

-

- Copyright © 1994-2007 - W3C® - - (MIT, - ERCIM, - Keio), - All Rights Reserved. - W3C liability, - trademark, - document use - and software licensing - - rules apply. Your interactions with this site are in accordance - with our public and - Member privacy - statements. -

- +

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/about.html.zh-cn b/about.html.zh-cn index a1df2bd72..efe4cb557 100644 --- a/about.html.zh-cn +++ b/about.html.zh-cn @@ -15,7 +15,7 @@

-

+

CSS Validation Service

Check Cascading Style Sheets (CSS) and (X)HTML documents with style sheets @@ -61,17 +61,17 @@

大部分的网页是使用html的计算机语言编写的，这种语言能创建一个结构化划分信息，超链接，多媒体对象等。对于颜色，文字，布局等样式方面的问题，html采用css来解决，css是“层叠样式表”的简称。这个工具所做的事情就是帮助用户进行css的检查，并且在需要的时候可以做一些自动更正。

那么，这个东西是判断一个css是正确与否的权威么？

-

不，它只是一个有用的可靠的软件工具，和所有的软件一样，它也有自己的bug和问题&legacy bug和问题。真正的权威应该参考css标准。

+

不，它只是一个有用的可靠的软件工具，和所有的软件一样，它也有自己的bug和问题&legacy bug和问题。真正的权威应该参考css标准。

需要花费多少钱？

-

不需要。这个服务是免费的，并且源代码也是公开的，你可以自由的下载，使用，修改，分发等等。 如果你很喜欢它，我们也欢迎你加入这个项目，或者通过w3c的支持者程序来资助它，但是没有任何人可以强迫你这样做。

+

不需要。这个服务是免费的，并且源代码也是公开的，你可以自由的下载，使用，修改，分发等等。 如果你很喜欢它，我们也欢迎你加入这个项目，或者通过w3c的支持者程序来资助它，但是没有任何人可以强迫你这样做。

谁写了这个工具？谁在维护这个工具？

W3C维护并运行这个服务，感谢w3c的成员，志愿开发者和志愿翻译者所作的工作。更详细的信息请访问创作人员列表。你也可以加入进来。

我能帮着做点什么呢？

-

当然，如果你是一个Java的编程人员，你可以通过取得源代码，添加你的新代码或者改正bug&legacy bug的代码。

-

除此之外，你也可以通过改进文档，翻译，加入mailinglist去解答别人的疑问来帮助这个工具。

+

当然，如果你是一个Java的编程人员，你可以通过取得源代码，添加你的新代码或者改正bug&legacy bug的代码。

+

除此之外，你也可以通过改进文档，翻译，加入mailinglist去解答别人的疑问来帮助这个工具。

还有别的问题？

如果你还有别的关于css或者css验证器的问题，请加入mailinglist或者论坛。但是在那之前，请仔细阅读一下css验证器的常见问题及解答(FAQ)，避免不必要的重复劳动和浪费别人的精力。

@@ -195,37 +195,19 @@ - -

- +

- - + +

-

- Copyright © 1994-2009 - W3C® - - (MIT, - ERCIM, - Keio), - All Rights Reserved. - W3C 责任, - 商标,已运用 - 文档授权 - - 和 软件授权 - - 相关规则。你与本站的互动是符合我们的公开 和 - 会员 隐私声明。 -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/api.html b/api.html index adab3dcfd..372f92537 100644 --- a/api.html +++ b/api.html @@ -17,7 +17,7 @@

-

+

CSS Validation Service

Check Cascading Style Sheets (CSS) and (X)HTML documents with style sheets @@ -58,13 +58,13 @@

SOAP format description

switch to its SOAP 1.2 interface. Below is a sample response, as well as a description of the most important elements of the response.

-

A WSDL 2 description file is lso available for this service.

+

A WSDL 2 description file is lso available for this service.

sample SOAP 1.2 validation request

It is a simple HTTP GET call to a URI like:

-

http://jigsaw.w3.org/css-validator/validator?uri=http%3A%2F%2Fwww.w3.org%2F&warning=0&profile=css2

+

https://jigsaw.w3.org/css-validator/validator?uri=http%3A%2F%2Fwww.w3.org%2F&warning=0&profile=css2

sample SOAP 1.2 validation response

@@ -88,7 +88,7 @@

sample SOAP 1.2 validation response

<m:warnings xml:lang="en"> <m:warningcount>79</m:warningcount> <m:warninglist> - <m:uri>http://www.w3.org/StyleSheets/home.css</m:uri> + <m:uri>https://www.w3.org/StyleSheets/home.css</m:uri> <m:warning> <m:line>85</m:line> <m:level>0</m:level> @@ -96,7 +96,7 @@

sample SOAP 1.2 validation response

</m:warning> </m:warninglist> <m:warninglist> - <m:uri>http://www.w3.org/StyleSheets/home-import.css</m:uri> + <m:uri>https://www.w3.org/StyleSheets/home-import.css</m:uri> <m:warning> <m:line>167</m:line> <m:level>0</m:level> @@ -135,13 +135,13 @@

SOAP1.2 response format reference

uri the address of the document validated. In EARL terms, this is the + href="https://www.w3.org/WAI/ER/">EARL terms, this is the TestSubject. checkedby Location of the service which provided the validation result. In EARL terms, this is the + href="https://www.w3.org/WAI/ER/">EARL terms, this is the Assertor. @@ -233,36 +233,16 @@

SOAP1.2 atomic message (error or warning) format

- - - +

- - + +

-

- Copyright © 1994-2009 - W3C® - - (MIT, - ERCIM, - Keio), - All Rights Reserved. - W3C liability, - trademark, - document use - - and software licensing - - rules apply. Your interactions with this site are in accordance - with our public and - Member privacy - statements. -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/autotest/AutoTestContentHandler.java b/autotest/AutoTestContentHandler.java index fe30da2f4..e97efbd4d 100644 --- a/autotest/AutoTestContentHandler.java +++ b/autotest/AutoTestContentHandler.java @@ -239,14 +239,14 @@ public void endElement(String nameSpaceURI, String localName, String rawName) if (element == TESTSUITE) { print("

"); - print(" "); + print(" "); print(" "); print(" "); - print(" "); + print(" "); print(" "); print(" "); print("

"); diff --git a/autotest/results/bugs.html b/autotest/results/bugs.html index 3b7b5e9e0..035969825 100644 --- a/autotest/results/bugs.html +++ b/autotest/results/bugs.html @@ -34,7 +34,7 @@

bugs

testsuite/bugs/4870-5586.css

Go to the Validator page

-

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=4870 and http://www.w3.org/Bugs/Public/show_bug.cgi?id=5586

+

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=4870 and http://www.w3.org/Bugs/Public/show_bug.cgi?id=5586

Awaited result

Valid

@@ -49,7 +49,7 @@

testsuite/bugs/4870-5586.css

testsuite/bugs/750.css

Go to the Validator page

-

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=750

+

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=750

Awaited result

Not valid

@@ -64,7 +64,7 @@

testsuite/bugs/750.css

testsuite/bugs/372.css

Go to the Validator page

-

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=372

+

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=372

Awaited result

Not valid

@@ -109,7 +109,7 @@

testsuite/bugs/cor

testsuite/bugs/920.css

Go to the Validator page

-

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=920

+

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=920

Awaited result

Not valid

@@ -124,7 +124,7 @@

testsuite/bugs/920.css

testsuite/bugs/778.css

Go to the Validator page

-

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=778

+

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=778

Awaited result

Not valid

@@ -139,7 +139,7 @@

testsuite/bugs/778.css

testsuite/bugs/289.css

Go to the Validator page

-

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=289

+

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=289

Awaited result

Not valid

@@ -154,7 +154,7 @@

testsuite/bugs/289.css

testsuite/bugs/287.css

Go to the Validator page

-

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=287

+

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=287

Awaited result

Not valid

@@ -169,7 +169,7 @@

testsuite/bugs/287.css

testsuite/bugs/696.css

Go to the Validator page

-

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=696

+

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=696

Awaited result

Not valid

@@ -182,9 +182,9 @@

testsuite/bugs/696.css

-

http://www.w3.org/Bugs/Public/attachment.cgi?id=471

+

http://www.w3.org/Bugs/Public/attachment.cgi?id=471

Go to the Validator page

-

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=697

+

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=697

Awaited result

Valid

@@ -199,7 +199,7 @@

http://www.w3.

testsuite/bugs/764.css

Go to the Validator page

-

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=764

+

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=764

Awaited result

Valid

@@ -214,7 +214,7 @@

testsuite/bugs/764.css

testsuite/bugs/1237.css

Go to the Validator page

-

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=1237

+

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=1237

Awaited result

Valid

@@ -229,7 +229,7 @@

testsuite/bugs/1237.css

testsuite/bugs/1269.css

Go to the Validator page

-

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=1269

+

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=1269

Awaited result

Not valid

@@ -244,7 +244,7 @@

testsuite/bugs/1269.css

testsuite/bugs/1269bis.css

Go to the Validator page

-

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=764

+

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=764

Awaited result

Not valid

@@ -259,7 +259,7 @@

testsuite/bugs/1269bis.css

testsuite/bugs/1847css3.css

Go to the Validator page

-

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=1847

+

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=1847

Awaited result

Valid

@@ -274,7 +274,7 @@

testsuite/bugs/1847css3.css

testsuite/bugs/1885.css

Go to the Validator page

-

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=1885

+

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=1885

Awaited result

Valid

@@ -289,7 +289,7 @@

testsuite/bugs/1885.css

testsuite/bugs/391printscreen.css

Go to the Validator page

-

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=391

+

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=391

Awaited result

Valid

@@ -304,7 +304,7 @@

testsuite/bugs/391printscreen.cs

testsuite/bugs/576css3.css

Go to the Validator page

-

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=576

+

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=576

Awaited result

Valid

@@ -319,7 +319,7 @@

testsuite/bugs/576css3.css

testsuite/bugs/599.css

Go to the Validator page

-

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=599

+

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=599

Awaited result

Valid

@@ -334,7 +334,7 @@

testsuite/bugs/599.css

testsuite/bugs/703.css

Go to the Validator page

-

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=703

+

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=703

Awaited result

Valid

@@ -349,7 +349,7 @@

testsuite/bugs/703.css

testsuite/bugs/763mobile.css

Go to the Validator page

-

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=763

+

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=763

Awaited result

Valid

@@ -364,7 +364,7 @@

testsuite/bugs/763mobile.css

testsuite/bugs/777.css

Go to the Validator page

-

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=777

+

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=777

Awaited result

Valid

@@ -379,7 +379,7 @@

testsuite/bugs/777.css

testsuite/bugs/791.css

Go to the Validator page

-

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=791

+

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=791

Awaited result

Valid

@@ -394,7 +394,7 @@

testsuite/bugs/791.css

testsuite/bugs/819.css

Go to the Validator page

-

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=819

+

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=819

Awaited result

Valid

@@ -409,7 +409,7 @@

testsuite/bugs/819.css

testsuite/bugs/821.css

Go to the Validator page

-

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=821

+

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=821

Awaited result

Valid

@@ -424,7 +424,7 @@

testsuite/bugs/821.css

testsuite/bugs/979.css

Go to the Validator page

-

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=979

+

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=979

Awaited result

Valid

@@ -437,9 +437,9 @@

testsuite/bugs/979.css

-

http://www.w3.org/Bugs/Public/attachment.cgi?id=388

+

http://www.w3.org/Bugs/Public/attachment.cgi?id=388

Go to the Validator page

-

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=1504

+

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=1504

Awaited result

Valid

@@ -452,9 +452,9 @@

http://www.w3.

-

http://www.w3.org/Bugs/Public/attachment.cgi?id=389

+

http://www.w3.org/Bugs/Public/attachment.cgi?id=389

Go to the Validator page

-

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=1504

+

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=1504

Awaited result

Valid

@@ -469,7 +469,7 @@

http://www.w3.

testsuite/bugs/2560.css

Go to the Validator page

-

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=2560

+

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=2560

Awaited result

Valid

@@ -484,7 +484,7 @@

testsuite/bugs/2560.css

testsuite/bugs/3037.css

Go to the Validator page

-

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=3037

+

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=3037

Awaited result

Not valid

@@ -499,7 +499,7 @@

testsuite/bugs/3037.css

testsuite/bugs/2800.css

Go to the Validator page

-

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=2800

+

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=2800

Awaited result

Not valid

@@ -514,7 +514,7 @@

testsuite/bugs/2800.css

testsuite/bugs/233.css

Go to the Validator page

-

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=233

+

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=233

Awaited result

Valid

@@ -529,7 +529,7 @@

testsuite/bugs/233.css

testsuite/bugs/2919.css

Go to the Validator page

-

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=2919

+

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=2919

Awaited result

Not valid

@@ -544,7 +544,7 @@

testsuite/bugs/2919.css

testsuite/bugs/3099.css

Go to the Validator page

-

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=3099

+

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=3099

Awaited result

Not valid

@@ -559,7 +559,7 @@

testsuite/bugs/3099.css

testsuite/bugs/3627.css

Go to the Validator page

-

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=3627

+

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=3627

Awaited result

Valid

@@ -574,7 +574,7 @@

testsuite/bugs/3627.css

testsuite/bugs/3628.css

Go to the Validator page

-

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=3628

+

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=3628

Awaited result

Not valid

@@ -589,7 +589,7 @@

testsuite/bugs/3628.css

testsuite/bugs/3628.css

Go to the Validator page

-

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=3628

+

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=3628

Awaited result

Valid

@@ -604,7 +604,7 @@

testsuite/bugs/3628.css

testsuite/bugs/3630.css

Go to the Validator page

-

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=3630

+

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=3630

Awaited result

Not valid

@@ -619,7 +619,7 @@

testsuite/bugs/3630.css

testsuite/bugs/3630.css

Go to the Validator page

-

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=3630

+

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=3630

Awaited result

Not valid

@@ -634,7 +634,7 @@

testsuite/bugs/3630.css

testsuite/bugs/3631.css

Go to the Validator page

-

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=3631

+

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=3631

Awaited result

Not valid

@@ -649,7 +649,7 @@

testsuite/bugs/3631.css

testsuite/bugs/3632.css

Go to the Validator page

-

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=3632

+

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=3632

Awaited result

Not valid

@@ -664,7 +664,7 @@

testsuite/bugs/3632.css

testsuite/bugs/3633.css

Go to the Validator page

-

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=3633

+

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=3633

Awaited result

Not valid

@@ -679,7 +679,7 @@

testsuite/bugs/3633.css

testsuite/bugs/3634.css

Go to the Validator page

-

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=3634

+

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=3634

Awaited result

Not valid

@@ -694,7 +694,7 @@

testsuite/bugs/3634.css

testsuite/bugs/4981.css

Go to the Validator page

-

See Bug 4981

+

See Bug 4981

Awaited result

Not valid

@@ -707,9 +707,9 @@

testsuite/bugs/4981.css

-

http://www.w3.org/Bugs/Public/attachment.cgi?id=528

+

http://www.w3.org/Bugs/Public/attachment.cgi?id=528

Go to the Validator page

-

See Bug 2920

+

See Bug 2920

Awaited result

Not valid

@@ -722,9 +722,9 @@

http://www.w3.

-

http://www.w3.org/Bugs/Public/attachment.cgi?id=529

+

http://www.w3.org/Bugs/Public/attachment.cgi?id=529

Go to the Validator page

-

See Bug 2920

+

See Bug 2920

Awaited result

Not valid

@@ -737,9 +737,9 @@

http://www.w3.

-

http://www.w3.org/Bugs/Public/attachment.cgi?id=530

+

http://www.w3.org/Bugs/Public/attachment.cgi?id=530

Go to the Validator page

-

See Bug 2920

+

See Bug 2920

Awaited result

Not valid

@@ -752,9 +752,9 @@

http://www.w3.

-

http://www.w3.org/Bugs/Public/attachment.cgi?id=531

+

http://www.w3.org/Bugs/Public/attachment.cgi?id=531

Go to the Validator page

-

See Bug 2920

+

See Bug 2920

Awaited result

Not valid

@@ -767,9 +767,9 @@

http://www.w3.

-

http://www.w3.org/Bugs/Public/attachment.cgi?id=532

+

http://www.w3.org/Bugs/Public/attachment.cgi?id=532

Go to the Validator page

-

See Bug 2920

+

See Bug 2920

Awaited result

Not valid

@@ -782,9 +782,9 @@

http://www.w3.

-

http://www.w3.org/Bugs/Public/attachment.cgi?id=533

+

http://www.w3.org/Bugs/Public/attachment.cgi?id=533

Go to the Validator page

-

See Bug 2920

+

See Bug 2920

Awaited result

Not valid

@@ -797,9 +797,9 @@

http://www.w3.

-

http://www.w3.org/Bugs/Public/attachment.cgi?id=534

+

http://www.w3.org/Bugs/Public/attachment.cgi?id=534

Go to the Validator page

-

See Bug 2920

+

See Bug 2920

Awaited result

Not valid

@@ -812,9 +812,9 @@

http://www.w3.

-

http://www.w3.org/Bugs/Public/attachment.cgi?id=535

+

http://www.w3.org/Bugs/Public/attachment.cgi?id=535

Go to the Validator page

-

See Bug 4469

+

See Bug 4469

Awaited result

Not valid

@@ -827,9 +827,9 @@

http://www.w3.

-

http://www.w3.org/Bugs/Public/attachment.cgi?id=536

+

http://www.w3.org/Bugs/Public/attachment.cgi?id=536

Go to the Validator page

-

See Bug 3632

+

See Bug 3632

Awaited result

Not valid

@@ -842,9 +842,9 @@

http://www.w3.

-

http://www.w3.org/Bugs/Public/attachment.cgi?id=537

+

http://www.w3.org/Bugs/Public/attachment.cgi?id=537

Go to the Validator page

-

See Bug 3634

+

See Bug 3634

Awaited result

Not valid

@@ -857,9 +857,9 @@

http://www.w3.

-

http://www.w3.org/Bugs/Public/attachment.cgi?id=540

+

http://www.w3.org/Bugs/Public/attachment.cgi?id=540

Go to the Validator page

-

See Bug 5588

+

See Bug 5588

Awaited result

Valid

@@ -874,7 +874,7 @@

http://www.w3.

testsuite/general/selectors/multipleattribute.css

Go to the Validator page

-

Seecss21 specandbug 5683

+

Seecss21 specandbug 5683

Awaited result

Valid

@@ -887,9 +887,9 @@

testsuite/genera

-

http://www.w3.org/Bugs/Public/attachment.cgi?id=543

+

http://www.w3.org/Bugs/Public/attachment.cgi?id=543

Go to the Validator page

-

See Bug 5581

+

See Bug 5581

Awaited result

Not valid

@@ -902,9 +902,9 @@

http://www.w3.

-

http://www.w3.org/Bugs/Public/attachment.cgi?id=544

+

http://www.w3.org/Bugs/Public/attachment.cgi?id=544

Go to the Validator page

-

See Bug 5581

+

See Bug 5581

Awaited result

Not valid

@@ -917,9 +917,9 @@

http://www.w3.

-

http://www.w3.org/Bugs/Public/attachment.cgi?id=545

+

http://www.w3.org/Bugs/Public/attachment.cgi?id=545

Go to the Validator page

-

See Bug 5581

+

See Bug 5581

Awaited result

Not valid

@@ -932,9 +932,9 @@

http://www.w3.

-

http://www.w3.org/Bugs/Public/attachment.cgi?id=610

+

http://www.w3.org/Bugs/Public/attachment.cgi?id=610

Go to the Validator page

-

See Bug 6297

+

See Bug 6297

Awaited result

Not valid

@@ -947,9 +947,9 @@

http://www.w3.

-

http://www.w3.org/Bugs/Public/attachment.cgi?id=611

+

http://www.w3.org/Bugs/Public/attachment.cgi?id=611

Go to the Validator page

-

See Bug 6297

+

See Bug 6297

Awaited result

Not valid

@@ -962,14 +962,14 @@

http://www.w3.

- + - +

diff --git a/autotest/results/general.html b/autotest/results/general.html index 160a6ef7a..e63f8bb7a 100644 --- a/autotest/results/general.html +++ b/autotest/results/general.html @@ -65,7 +65,7 @@

bugs

testsuite/general/bugs/corrected-bug-750.css

Go to the Validator page

-

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=750

+

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=750

Awaited result

Not valid

@@ -80,7 +80,7 @@

testsuite/general/bug

testsuite/general/bugs/corrected-bug-372.css

Go to the Validator page

-

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=372

+

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=372

Awaited result

Not valid

@@ -125,7 +125,7 @@

testsuite/

testsuite/general/bugs/corrected-bug-920.css

Go to the Validator page

-

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=920

+

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=920

Awaited result

Not valid

@@ -140,7 +140,7 @@

testsuite/general/bug

testsuite/general/bugs/corrected-bug-778.css

Go to the Validator page

-

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=778

+

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=778

Awaited result

Not valid

@@ -155,7 +155,7 @@

testsuite/general/bug

testsuite/general/bugs/corrected-bug-289.css

Go to the Validator page

-

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=289

+

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=289

Awaited result

Not valid

@@ -170,7 +170,7 @@

testsuite/general/bug

testsuite/general/bugs/corrected-bug-287.css

Go to the Validator page

-

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=287

+

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=287

Awaited result

Not valid

@@ -185,7 +185,7 @@

testsuite/general/bug

testsuite/general/bugs/corrected-bug-696.css

Go to the Validator page

-

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=696

+

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=696

Awaited result

Not valid

@@ -200,7 +200,7 @@

testsuite/general/bug

testsuite/general/bugs/corrected-bug-764.css

Go to the Validator page

-

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=764

+

See http://www.w3.org/Bugs/Public/show_bug.cgi?id=764

Awaited result

Valid

@@ -214,7 +214,7 @@

testsuite/general/bug

loops

-

http://jigsaw.w3.org/Yves/testloop2.css

+

http://jigsaw.w3.org/Yves/testloop2.css

Go to the Validator page

This CSS calls testloop3.css which calls testloop2...

@@ -1398,14 +1398,14 @@

testsuite/g

- + - +

diff --git a/autotest/results/propertiesCSS1.html b/autotest/results/propertiesCSS1.html index 6e955e46d..1b49a8ec3 100644 --- a/autotest/results/propertiesCSS1.html +++ b/autotest/results/propertiesCSS1.html @@ -183,14 +183,14 @@

tests

- + - +

diff --git a/autotest/results/propertiesCSS2.html b/autotest/results/propertiesCSS2.html index 2b994e9fe..1eab4e6a3 100644 --- a/autotest/results/propertiesCSS2.html +++ b/autotest/results/propertiesCSS2.html @@ -665,14 +665,14 @@

testsuite/

- + - +

diff --git a/autotest/results/propertiesCSS3.html b/autotest/results/propertiesCSS3.html index 370f0a551..eef21de24 100644 --- a/autotest/results/propertiesCSS3.html +++ b/autotest/results/propertiesCSS3.html @@ -47,14 +47,14 @@

testsuite/properties/

- + - +

diff --git a/build.xml b/build.xml index 64f3c47a5..417780e63 100644 --- a/build.xml +++ b/build.xml @@ -32,24 +32,22 @@ - - - + + - - - - - - - + + + + + + - - - - + + + + @@ -60,45 +58,41 @@ - - - + + - - - - - - + + + + + - + - - - + + + - - - + + - - - - - - + + + + + - + - - - + + + @@ -157,7 +151,7 @@ - + diff --git a/documentation.html.bg b/documentation.html.bg index c4828c815..38a70d467 100644 --- a/documentation.html.bg +++ b/documentation.html.bg @@ -17,7 +17,7 @@

-

+

CSS Validation Service

Проверете Cascading Style Sheets (CSS) и (X)HTML документи със style sheets @@ -60,7 +60,7 @@

Web Service API

Документация на SOAP 1.2 интерфейс за валидация

-

Бъгове & Бъгове

+

Бъгове & Бъгове

Спорни моменти в настоящата версия на валидатора и интерфейс за известяване за бъгове и проблеми. Вижте също инструкциите за обратна връзка.

@@ -135,31 +135,16 @@

- +

+

-Подкрепете този инструмент, станете
- + + +

-

- Copyright © 1994-2007 - W3C® - - (MIT, - ERCIM, - Keio), - All Rights Reserved. - W3C liability, - trademark, - document use - and software licensing - - rules apply. Your interactions with this site are in accordance - with our public and - Member privacy - statements. -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/documentation.html.de b/documentation.html.de index 641e8f387..42885b41c 100644 --- a/documentation.html.de +++ b/documentation.html.de @@ -13,7 +13,7 @@

-

+

CSS Validierungsdienst

Check Cascading Style Sheets (CSS) and (X)HTML documents with style sheets @@ -51,7 +51,7 @@

Web Service API

Dokumentation zum SOAP 1.2 Interface

-

Bugs & Legacy Bugs

+

Bugs & Legacy Bugs

Bekannte Probleme in der aktuellen Version des Validators und ein Interface zum Melden von neuen Bugs und Problemen. Siehe auch Anleitung zum Feedback.

@@ -176,32 +176,15 @@

- +

- - + +

-

- Copyright © 1994-2009 - W3C® - - (MIT, - ERCIM, - Keio), - All Rights Reserved. - W3C liability, - trademark, - document use - and software licensing - - rules apply. Your interactions with this site are in accordance - with our public and - Member privacy - statements. -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/documentation.html.el b/documentation.html.el index b024b8d06..94946d529 100644 --- a/documentation.html.el +++ b/documentation.html.el @@ -16,7 +16,7 @@

-

+

Υπηρεσία Ελέγχου Εγκυρότητας CSS

Έλεγχος Cascading Style Sheets (CSS) και εγγράφων (X)HTML με style sheets @@ -62,7 +62,7 @@

API Υπηρεσίας Web

Εγχειρίδιο της διασύνδεσης ελέγχου εγκυρότητας SOAP 1.2

-

Σφάλματα & Σφάλματα

+

Σφάλματα & Σφάλματα

Γνωστά προβλήματα στην τρέχουσα έκδοση του ελεγκτή εγκυρότητας και μία διασύνδεση για την υποβολή νέων σφαλμάτων και προβλημάτων. Δείτε επίσης τις οδηγίες για την υποβολή της γνώμη σας.

@@ -180,28 +180,16 @@

- +

- - + +

-

- Πνευματικά Δικαιώματα © 1994-2009 - W3C® +

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

- (MIT, - ERCIM, - Keio), - Με επιφύλαξη παντός δικαιώματος. - Εφαρμόζονται οι κανόνες της W3C για ευθύνη, - καταχωρημένο εμπορικό σήμα, - χρήση εγγράφου - - και άδεια χρήσης λογισμικού. Η αλληλεπίδραση σας με αυτόν τον ιστότοπο γίνεται σύμφωνα με τις δηλώσεις μας απορρήτου για δημόσια χρήση και για τα - Μέλη.

diff --git a/documentation.html.en b/documentation.html.en index b3b2e08c0..fd0081c53 100644 --- a/documentation.html.en +++ b/documentation.html.en @@ -16,7 +16,7 @@

-

+

CSS Validation Service

Check Cascading Style Sheets (CSS) and (X)HTML documents with style sheets @@ -65,7 +65,7 @@

Web Service API

SOAP 1.2 validation interface documentation

-

Bugs & Legacy Bugs

+

Bugs & Legacy Bugs

Known issues in the current version of the validator, and an interface to submit new bugs and issues. See also the feedback instructions.

@@ -189,32 +189,15 @@

- +

- - + +

-

- Copyright © 1994-2009 - W3C® - - (MIT, - ERCIM, - Keio), - All Rights Reserved. - W3C liability, - trademark, - document use - and software licensing - - rules apply. Your interactions with this site are in accordance - with our public and - Member privacy - statements. -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/documentation.html.es b/documentation.html.es index 5ce3dab00..786231906 100644 --- a/documentation.html.es +++ b/documentation.html.es @@ -15,7 +15,7 @@

-

+

Servicio de Validación de CSS

Check Cascading Style Sheets (CSS) and (X)HTML documents with style sheets @@ -59,7 +59,7 @@

Documentación de la interfaz de validación SOAP 1.2

-Bugs & Legacy Bugs +Bugs & Legacy Bugs

Incidencias conocidas en la versión actual del validador, y una interfaz para enviar nuevas incidencias o errores. Ver también las instrucciones de feedback.

@@ -193,43 +193,16 @@

- - - - - +

- - + +

-

-Copyright © 1994-2009 - -W3C -® - - ( -MIT -, - -ERCIM -, - Keio), - All Rights Reserved. - W3C liability, - trademark, - document use - and software licensing - - rules apply. Your interactions with this site are in accordance - with our public and - Member privacy - statements. -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/documentation.html.fa b/documentation.html.fa index da253ba85..4ec06dea1 100644 --- a/documentation.html.fa +++ b/documentation.html.fa @@ -16,7 +16,7 @@

-

سرویس اعتبار سنجی CSS

+

سرویس اعتبار سنجی CSS

محک زدن شیوه نامه های آبشاری (CSS) و اسناد X)HTML) حاوی شیوه نامه ها

@@ -60,7 +60,7 @@

- اشکالات & اشکالات

+ اشکالات & اشکالات

موضوعات شناخته شده در ورژن جاری اعتبار سنج و یک واسط جهت ارایه ی اشکالات جدید و مسائل مشخص. دستور العمل های بازخورد را نیز مشاهده کنید.

@@ -136,55 +136,16 @@

- +

+

-حمایت از این ابزار و تبدیل شدن به
- + + +

-

- کلیه - حقوق چاپ و نشر © 1994-2007 - - W3C ® برای - - (MIT, - - ERCIM, - Keio)، - محفوظ است. - W3C ، رعایت قوانین مربوط به - - مارک تجاری، - استفاده - از سند و - مجوز - استفاده نرم افزار را - - الزامی نموده است. تعامل شما با این سایت بر اساس بیانیه اختصاصی - - اعضا و - - گروه ما می باشد.
- - Copyright © 1994-2007 - W3C® - - (MIT, - ERCIM, - Keio), - All Rights Reserved. - W3C liability, - trademark, - document use - and software licensing - - rules apply. Your interactions with this site are in accordance - with our public and - Member - privacy statements -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/documentation.html.fr b/documentation.html.fr index dc8ad0029..b1b37fd42 100644 --- a/documentation.html.fr +++ b/documentation.html.fr @@ -16,7 +16,7 @@

-

+

Service de validation CSS

Check Cascading Style Sheets (CSS) and (X)HTML documents with style sheets @@ -51,7 +51,7 @@

Un aperçu du code du validateur CSS

L'API de service Web

La documentation de l'interface de validation SOAP 1.2

-

Les bogues & Les bogues

+

Les bogues & Les bogues

Les problèmes connus de la version actuelle du validateur, et une interface pour soumettre des bogues et problèmes nouveaux. Voir également les instructions pour laisser un commentaire.

@@ -167,34 +167,19 @@ Voir également les instructions pour laisser un commentair - -

- +

- - + +

-

-Copyright © 1994-2009 -W3C® -(MIT, -ERCIM, -Keio), tous droits réservés. -Les règles de responsabilité, -de nom de marque, -d'utilisation des documents -et d'octroi de licences logicielles -du W3C s'appliquent. Vos interactions avec ce site sont conformes à nos déclarations de confidentialité -publiques et vis-à-vis -de nos membres. -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/documentation.html.hi b/documentation.html.hi index d8283484e..7d17964e3 100644 --- a/documentation.html.hi +++ b/documentation.html.hi @@ -18,7 +18,7 @@

-

+

सीएसएस मान्यकरण सेवा

शैली (सीएसएस) शीट शैली पत्रक और के साथ (एक्स) HTML दस्तावेजों @@ -61,7 +61,7 @@ कीड़े & - + कीड़े

मान्यकर्ता के वर्तमान संस्करण में ज्ञात मुद्दों, और एक अंतरफलक नए कीड़े और मुद्दों को प्रस्तुत करने के लिए.भी प्रतिक्रिया @@ -125,30 +125,13 @@

- - +

-

- +

+

-

- - Copyright © 1994-2009 - W3C® (MIT, - - - ERCIM, Keio), All Rights - Reserved. W3C - liability, - trademark, - - document use and - - software licensing rules apply. Your interactions with this site are in - accordance with our - public - and Member - privacy statements.

+ +

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/documentation.html.it b/documentation.html.it index dd3470d26..f5f843620 100644 --- a/documentation.html.it +++ b/documentation.html.it @@ -17,7 +17,7 @@

-

+

Servizio di validazione CSS

Check Cascading Style Sheets (CSS) and (X)HTML documents with style sheets @@ -59,7 +59,7 @@

Web Service API

Documentazione SOAP 1.2 per l'interfacciamento alla validazione

-

Problemi & Problemi

+

Problemi & Problemi

Problematiche conosciute nella versione corrente del validatore, nonché un'interfaccia per segnalare nuovi problemi o argomenti di discussione. Consultare anche le istruzioni per l'invio di commenti.

@@ -182,28 +182,15 @@

- +

- - + +

-

- Copyright © 1994-2009 - W3C® - - (MIT, - ERCIM, - Keio), - Tutti i diritti riservati. - Si applicano le regole del W3C riguardanti la responsabilità, - marchi depositati, - l'utilizzo dei documenti - - e le licenze software. L'interazione con i contenuti di questi siti è in accordo con le nostre definizioni di pubblico e privato per quanto riguarda la riservatezza delle informazioni. -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/documentation.html.ja b/documentation.html.ja index 949f97c2f..7e66e10f0 100644 --- a/documentation.html.ja +++ b/documentation.html.ja @@ -16,7 +16,7 @@

-

+

CSS 検証サービス

Check Cascading Style Sheets (CSS) and (X)HTML documents with style sheets @@ -64,7 +64,7 @@

ウェブサービスAPI

SOAP 1.2 検査インターフェースについての文書

-

バグ & バグ

+

バグ & バグ

現バージョンの CSS 検証サービスに既知の問題と、新しいバグや問題を投稿するためのインターフェース。 フィードバックの手引きも参照してください。

@@ -188,30 +188,15 @@

- +

- - + +

-

- Copyright © 1994-2009 - W3C® - - (MIT, - ERCIM, - 慶應義塾大学), - All Rights Reserved. - W3C の責任範囲、 - 商標、 - 文書の利用、 - そしてライセンス - の規則が適用されます。 - このサイトの訪問者は、私たちの一般およびメンバープライバシー声明に従うものとします。 - -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/documentation.html.ko b/documentation.html.ko index d413889d0..891d6a701 100644 --- a/documentation.html.ko +++ b/documentation.html.ko @@ -16,7 +16,7 @@

-

+

CSS 검사 서비스

캐스케이딩 스타일시트 (CSS)와 스타일시트를 포함한 문서를 검사 @@ -57,7 +57,7 @@

웹 서비스 API

SOAP 1.2로 검사 서비스 연동 관련 기술 문서

-

버그 & 버그

+

버그 & 버그

현 버전의 검사 서비스에서 알려진 문제점, 그리고 새로운 버그와 문제점을 보고할 수 있습니다. 보다 효율적으로 이용할 수 있게 피드백 설명이 제공됩니다.

@@ -179,33 +179,16 @@

- +

- - + +

-

- Copyright © 1994-2007 - W3C® - - (MIT, - ERCIM, - Keio), - All Rights Reserved. - W3C liability, - trademark, - document use - and software licensing - - rules apply. Your interactions with this site are in accordance - with our public and - Member privacy - statements. -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/documentation.html.nl b/documentation.html.nl index 02239205a..7d429f810 100644 --- a/documentation.html.nl +++ b/documentation.html.nl @@ -17,7 +17,7 @@

-

+

CSS Validation Service

Check Cascading Style Sheets (CSS) and (X)HTML documents with style sheets @@ -61,7 +61,7 @@

SOAP 1.2 validation interface documentatie

-

Bugs & Legacy Bugs

+

Bugs & Legacy Bugs

Bekende problemen in de huidige validator versie, en een mogelijkheid om nieuwe problemen in te sturen. Zie ook de feedback instructies.

@@ -188,35 +188,16 @@

- +

- - + +

-

- - Copyright © 1994-2009 - W3C® - - (MIT, - ERCIM, - Keio), - Alle Rechten Voorbehouden. - W3C aansprakelijkheid, - handelsmerk, - document gebruik - - en de software licentie - - regels zijn van toepassing. Je interacties met deze site zijn in overeenstemming - met onze publieke en - Member privacy - verklaringen. -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/documentation.html.pl-PL b/documentation.html.pl-PL index b658f5eec..2e4407ae9 100644 --- a/documentation.html.pl-PL +++ b/documentation.html.pl-PL @@ -16,7 +16,7 @@

-

+

Usługa Walidacji CSS

Check Cascading Style Sheets (CSS) and (X)HTML documents with style sheets @@ -57,7 +57,7 @@

API Usługi

Dokumentacja interfejsu walidatora SOAP 1.2

-

Błędy (bugs) & Błędy (legacy bugs)

+

Błędy (bugs) & Błędy (legacy bugs)

Znane problemy w obecnej wersji walidatora oraz interfejs do zgłaszania błędów i problemów. Zobacz także instrukcje na temat dostarczania opinii.

@@ -180,28 +180,16 @@

- +

- - + +

-

- Copyright © 1994-2009 - W3C® - - (MIT, - ERCIM, - Keio), - Wszystkie prawa zastrzeżone. W3C stosuje zasady dotyczące .odpowiedzialności cywilnej, - trademark, - używania dokumentu - i licencji oprogramowania.. Wszelkie interakcje z tą witryną są zgodne z naszą publiczną i - Członkowską ochroną prywatności. -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/documentation.html.pt-BR b/documentation.html.pt-BR index a84fff3a4..b723135b0 100644 --- a/documentation.html.pt-BR +++ b/documentation.html.pt-BR @@ -16,7 +16,7 @@

-

+

Serviço de validação CSS

Verifica folhas de estilo em cascata (CSS) e documentos (X)HTML com folhas de estilo @@ -60,7 +60,7 @@

Serviço Web API

Documentação para a interface de validação SOAP 1.2.

-

Bugs & Legacy Bugs

+

Bugs & Legacy Bugs

Questões conhecidas sobre a versão corrente do validador e uma interface para reportar novos bugs e questões. Ver também instruções para feedback.

@@ -181,32 +181,15 @@

- +

- - + +

-

- Copyright © 1994-2007 - W3C® - - (MIT, - ERCIM, - Keio), - All Rights Reserved. - W3C liability, - trademark, - document use - and software licensing - - rules apply. Your interactions with this site are in accordance - with our public and - Member privacy - statements. -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/documentation.html.ro b/documentation.html.ro index a176ab9dc..707a5539e 100644 --- a/documentation.html.ro +++ b/documentation.html.ro @@ -16,7 +16,7 @@

-

+

Serviciul W3C de validare

Verifica Foile de Stil in Cascada (CSS) si documentele (X)HTML @@ -65,7 +65,7 @@

Web Service API

Documentatia pentru interfata validatorului SOAP 1.2

-

Erori & Erori

+

Erori & Erori

Probleme cunoscute in versiunea actuala a validatorului si o interfata pentru a aduce la cunostinta noi erori si probleme. Vezi de asemenea instructiuni de raspuns..

@@ -191,32 +191,15 @@

- +

- - + +

-

- Copyright © 1994-2009 - W3C® - - (MIT, - ERCIM, - Keio), - All Rights Reserved. - W3C liability, - trademark, - document use - and software licensing - - rules apply. Your interactions with this site are in accordance - with our public and - Member privacy - statements. -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/documentation.html.ru b/documentation.html.ru index 39189290b..30e25cc29 100644 --- a/documentation.html.ru +++ b/documentation.html.ru @@ -16,7 +16,7 @@

-

+

Сервис проверки CSS

Проверка таблиц каскадных стилей (CSS) и документов (X)HTML с таблицами стилей @@ -58,7 +58,7 @@

API веб-сервиса

— документация по интерфейсу взаимодействия через SOAP 1.2.

-

Ошибки & Ошибки

+

Ошибки & Ошибки

— известные ошибки и проблемы работы текущей версии сервиса, форма для сообщения о новых ошибках и проблемах. Также смотрите инструкции по составлению отзывов.

@@ -176,40 +176,20 @@ rel="alternate">简体中文 - -

- +

- - + +

-

- Copyright © 1994-2007 - W3C® - - (MIT, - ERCIM, - Keio), - All Rights Reserved. - W3C liability, - trademark, - document use - and software licensing - - rules apply. Your interactions with this site are in accordance - with our public and - Member privacy - statements. -

- +

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/documentation.html.sv b/documentation.html.sv index 8e0376c6d..e0d1a3d9f 100644 --- a/documentation.html.sv +++ b/documentation.html.sv @@ -16,7 +16,7 @@

-

+

CSS valideringstjänst

Granska formatmallar ("Check Cascading Style Sheets, CSS) och (X)HTML-dokument med formatmallar @@ -59,7 +59,7 @@

Web Service API

Dokumentation av SOAP 1.2-gränssnitt mot valideraren

-

Buggar & Buggar

+

Buggar & Buggar

Kända problem i aktuell version av valideraren, och ett gränssnitt med vilket man kan meddela nya buggar och problem. Se även anvisningar för hur synpunkter delges.

@@ -183,32 +183,16 @@

- +

- - + +

-

- Copyright © 1994-2007 - W3C® - (MIT, - ERCIM, - Keio), - Rättigheter förbehållna. - W3C:s regler för - ansvar, - varumärke, - dokumentanvändning - och - programvarulicenser gäller. - Din interaktion med denna webbplats sker i enlighet med våra integritetspolicies för - allmänheten och - W3C:s medlemmar. -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/documentation.html.uk b/documentation.html.uk index 1fc090f9d..d147e2f7d 100644 --- a/documentation.html.uk +++ b/documentation.html.uk @@ -16,7 +16,7 @@

-

+

Сервіс перевірки CSS

Перевірка таблиць каскадних стилів (CSS) та документів (X)HTML з таблицями стилів @@ -58,7 +58,7 @@

API веб-сервіса

— документація по інтерфейсу взаємодії через SOAP 1.2.

-

Помилки & Помилки

+

Помилки & Помилки

— відомі помилки та проблеми роботы поточної версії сервісу, форма для повідомлення про нові помилки й проблеми. Також дивіться інструкції по складанню видгуків.

@@ -128,32 +128,16 @@

- +

-

Підтримайте проект — внесіть пожертву.
- +

+ + +

-

- Copyright © 1994-2007 - W3C® - - (MIT, - ERCIM, - Keio), - All Rights Reserved. - W3C liability, - trademark, - document use - and software licensing - - rules apply. Your interactions with this site are in accordance - with our public and - Member privacy - statements. -

- +

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/documentation.html.zh-cn b/documentation.html.zh-cn index a74956d86..0ecab513f 100644 --- a/documentation.html.zh-cn +++ b/documentation.html.zh-cn @@ -16,7 +16,7 @@

-

+

CSS Validation Service

Check Cascading Style Sheets (CSS) and (X)HTML documents with style sheets @@ -58,7 +58,7 @@

Web Service 的 API

关于SOAP 1.2 验证接口的文档

-

Bugs & Legacy Bugs

+

Bugs & Legacy Bugs

关于当前版本CSS 验证器的一些已知问题，并且提供提交新的bug和问题的链接。 更多请参考如何反馈信息.

@@ -177,36 +177,19 @@ -

- +

- - + +

-

- Copyright © 1994-2009 - W3C® - - (MIT, - ERCIM, - Keio), - All Rights Reserved. - W3C 责任, - 商标,已运用 - 文档授权 - - 和 软件授权 - - 相关规则。你与本站的互动是符合我们的公开 和 - 会员 隐私声明。 -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/images/CSS.gif b/images/CSS.gif deleted file mode 100644 index dee5356f5..000000000 Binary files a/images/CSS.gif and /dev/null differ diff --git a/images/css_validation_service.png b/images/css_validation_service.png deleted file mode 100644 index a9543cf96..000000000 Binary files a/images/css_validation_service.png and /dev/null differ diff --git a/images/footer.png b/images/footer.png deleted file mode 100644 index f0068b51d..000000000 Binary files a/images/footer.png and /dev/null differ diff --git a/images/head-tl.png b/images/head-tl.png deleted file mode 100644 index 9f5e60df7..000000000 Binary files a/images/head-tl.png and /dev/null differ diff --git a/images/head-tr.png b/images/head-tr.png deleted file mode 100644 index ed62aa6eb..000000000 Binary files a/images/head-tr.png and /dev/null differ diff --git a/images/header.jpg b/images/header.jpg deleted file mode 100644 index b77170f3d..000000000 Binary files a/images/header.jpg and /dev/null differ diff --git a/images/header.png b/images/header.png deleted file mode 100644 index 6abc8d255..000000000 Binary files a/images/header.png and /dev/null differ diff --git a/images/lg_gradient.gif b/images/lg_gradient.gif deleted file mode 100644 index 051566dd4..000000000 Binary files a/images/lg_gradient.gif and /dev/null differ diff --git a/images/logo1.jpg b/images/logo1.jpg deleted file mode 100644 index df3d0b3ca..000000000 Binary files a/images/logo1.jpg and /dev/null differ diff --git a/images/mailto.gif b/images/mailto.gif deleted file mode 100644 index a8b63c0cf..000000000 Binary files a/images/mailto.gif and /dev/null differ diff --git a/images/sm_gradient_active.gif b/images/sm_gradient_active.gif deleted file mode 100644 index 6676940b9..000000000 Binary files a/images/sm_gradient_active.gif and /dev/null differ diff --git a/images/sm_gradient_hover.gif b/images/sm_gradient_hover.gif deleted file mode 100644 index 02a7ce5ab..000000000 Binary files a/images/sm_gradient_hover.gif and /dev/null differ diff --git a/images/vcss-blue.gif b/images/vcss-blue.gif deleted file mode 100644 index c373b2a7e..000000000 Binary files a/images/vcss-blue.gif and /dev/null differ diff --git a/images/vcss-new.gif b/images/vcss-new.gif deleted file mode 100644 index 7530d30b4..000000000 Binary files a/images/vcss-new.gif and /dev/null differ diff --git a/images/vcss-new.png b/images/vcss-new.png deleted file mode 100644 index 069f7739d..000000000 Binary files a/images/vcss-new.png and /dev/null differ diff --git a/images/vcss-old.gif b/images/vcss-old.gif deleted file mode 100644 index 079ca4772..000000000 Binary files a/images/vcss-old.gif and /dev/null differ diff --git a/images/vcss-old.png b/images/vcss-old.png deleted file mode 100644 index 2f4110f82..000000000 Binary files a/images/vcss-old.png and /dev/null differ diff --git a/images/vcss.gif b/images/vcss.gif deleted file mode 100644 index 020c75a73..000000000 Binary files a/images/vcss.gif and /dev/null differ diff --git a/images/vh40.gif b/images/vh40.gif deleted file mode 100644 index c5e9402e7..000000000 Binary files a/images/vh40.gif and /dev/null differ diff --git a/images/w3c.gif b/images/w3c.gif deleted file mode 100644 index 6908a68dd..000000000 Binary files a/images/w3c.gif and /dev/null differ diff --git a/manual.html.bg b/manual.html.bg index b41c880e4..497a9e06f 100644 --- a/manual.html.bg +++ b/manual.html.bg @@ -18,7 +18,7 @@

-

+

CSS Validation Service

Проверете Cascading Style Sheets (CSS) и (X)HTML документи със style sheets @@ -110,12 +110,12 @@

Когато се използва основния интерфейс, валидаторът ще провери за съвместимост - с CSS 2, който е настоящата CSS + с CSS 2, който е настоящата CSS Техническа Препоръка.
Ще произведе XHTML резултат без никакви предупреждения (ще се бъдат изведени само грешки).
Медия е зададена на "Всички", което означава медия, подходяща за всички - устройства (виж + устройства (виж http://www.w3.org/TR/CSS2/media.html за пълно описание на медия).

@@ -151,9 +151,9 @@ CSS валидатора може да проверява различни CSS профили. Профилът съдържа всички особености, които една имплементация на отделна платформа се очаква да има. Тази дефиниция е посочена в - + сайта на CSS. Изборът по подразбиране съответства на настоящия най-използван: - CSS 2. + CSS 2.

Медия

@@ -161,7 +161,7 @@

Медия параметърът е еквивалентен на @media правилото, прилагано към целия документ. Повече информация за медия ще намерите в - + http://www.w3.org/TR/CSS2/media.html .

@@ -206,7 +206,7 @@ CSS Валидатора е безплатна публична услуга, щ usermedium - Медия + Медия използвана за валидиране, като screen, print, braille... all @@ -331,32 +331,16 @@ CSS Валидатора е безплатна публична услуга, щ

- +

-Подкрепете този инструмент, станете
- + + +

-

- Copyright © 1994-2007 - W3C® - - (MIT, - ERCIM, - Keio), - All Rights Reserved. - W3C liability, - trademark, - document use - and software licensing - - rules apply. Your interactions with this site are in accordance - with our public and - Member privacy - statements. -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/manual.html.de b/manual.html.de index c0a32feea..c667e58f4 100644 --- a/manual.html.de +++ b/manual.html.de @@ -11,7 +11,7 @@

-

+

CSS Validierungsdienst

Check Cascading Style Sheets (CSS) and (X)HTML documents with style sheets @@ -71,7 +71,7 @@ Sie die zu überprüfende Datei.Was tut die grundlegende Validierung?

-

Wenn Sie das Basis-Interface benutzen, prüft der Validator die Einhaltung von CSS 2.1, das die gegenwärtige Technical Recommendation darstellt.
Es produziert eine Ausgabe in XHTML ohne Warnungen (nur Fehler werden angezeigt).
Das Medium ist auf "all" eingestellt, was das geeignete Medium für alle Geräte ist (siehe http://www.w3.org/TR/CSS2/media.html für eine vollständige Beschreibung von Medien).

+

Wenn Sie das Basis-Interface benutzen, prüft der Validator die Einhaltung von CSS 2.1, das die gegenwärtige Technical Recommendation darstellt.
Es produziert eine Ausgabe in XHTML ohne Warnungen (nur Fehler werden angezeigt).
Das Medium ist auf "all" eingestellt, was das geeignete Medium für alle Geräte ist (siehe http://www.w3.org/TR/CSS2/media.html für eine vollständige Beschreibung von Medien).

Erweiterte Validierung

@@ -82,13 +82,13 @@ Sie die zu überprüfende Datei.Profile

-

Der CSS Validator kann verschiedene CSS-Profile überprüfen. Ein Profil listet alle Features auf, die eine Implementierung auf einer bestimmten Plattform implementieren sollte. Diese Definition ist von der CSS-Site übernommen. Die Voreinstellung entspricht dem derzeit am meist genutzten Profil: CSS 2. +

Der CSS Validator kann verschiedene CSS-Profile überprüfen. Ein Profil listet alle Features auf, die eine Implementierung auf einer bestimmten Plattform implementieren sollte. Diese Definition ist von der CSS-Site übernommen. Die Voreinstellung entspricht dem derzeit am meist genutzten Profil: CSS 2.

Medium

-

Der Medium-Parameter ist äquivalent zur @media-Regel, die für das gesamte Dokument gilt. Mehr Informationen zu @media finden Sie unter http://www.w3.org/TR/CSS2/media.html .

+

Der Medium-Parameter ist äquivalent zur @media-Regel, die für das gesamte Dokument gilt. Mehr Informationen zu @media finden Sie unter http://www.w3.org/TR/CSS2/media.html .

Für Experten

@@ -119,7 +119,7 @@ Sie die zu überprüfende Datei.medium für die Validierung, z.B. screen, + Das medium für die Validierung, z.B. screen, print, braille... all @@ -280,33 +280,16 @@ Sie die zu überprüfende Datei.

- +

- - + +

-

- Copyright (c) 1994-2009 - W3C(R) - - (MIT, - ERCIM, - Keio), - All Rights Reserved. - W3C liability, - trademark, - document use - and software licensing - - rules apply. Your interactions with this site are in accordance - with our public and - Member privacy - statements. -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/manual.html.el b/manual.html.el index c25a881e5..e36afe664 100644 --- a/manual.html.el +++ b/manual.html.el @@ -17,7 +17,7 @@

-

+

Υπηρεσία Ελέγχου Εγκυρότητας CSS

Έλεγχος Cascading Style Sheets (CSS) και εγγράφων (X)HTML με style sheets @@ -100,10 +100,10 @@

Τι κάνει ο βασικός έλεγχος εγκυρότητας;

- Κατά τη χρήση της βασικής διασύνδεσης, ο ελεγκτής εγκυρότητας ελέγχει τη συμβατότητα σύμφωνα με το CSS 2, το οποίο αποτελεί την τρέχουσα τεχνική πρόταση CSS.
+ Κατά τη χρήση της βασικής διασύνδεσης, ο ελεγκτής εγκυρότητας ελέγχει τη συμβατότητα σύμφωνα με το CSS 2, το οποίο αποτελεί την τρέχουσα τεχνική πρόταση CSS.
Παράγει μία έξοδο XHTML χωρίς καμία προειδοποίηση (θα δείτε μόνο σφάλματα).
Το μέσο είναι ορισμένο στο "όλα", το οποίο αποτελεί το κατάλληλο μέσο για όλες τις συσκευές - (δείτε τη σελίδα + (δείτε τη σελίδα http://www.w3.org/TR/CSS2/media.html για μία ολοκληρωμένη περιγραφή του μέσου).

@@ -128,16 +128,16 @@

Ο ελεγκτής εγκυρότητας CSS μπορεί να ελέγξει διαφορετικά προφίλ CSS. Ένα προφίλ εμφανίζει όλα τα χαρακτηριστικά που αναμένεται να υλοποιήσει μία υλοποίηση σε μία συγκεκριμένη πλατφόρμα. Ο ορισμός λαμβάνεται από από την - + τον ιστότοπο CSS. Η προεπιλεγμένη επιλογή ανταποκρίνεται στην πιο χρησιμοποιημένη τρέχουσα επιλογή: - CSS 2. + CSS 2.

Μέσον

Η παράμετρος μέσου ισοδυναμεί με τον κανόνα @media, ο οποίος εφαρμόζεται σε όλο το έγγραφο. Θα βρείτε περισσότερες πληροφορίες σχετικά με τα μέσα στη διεύθυνση - + http://www.w3.org/TR/CSS2/media.html .

@@ -174,7 +174,7 @@ CSS Ελεγκτή Εγκυρότητας.

usermedium - Το μέσο που χρησιμοποιείται για τον έλεγχο εγκυρότητας, όπως screen, + Το μέσο που χρησιμοποιείται για τον έλεγχο εγκυρότητας, όπως screen, print, braille... all @@ -282,33 +282,19 @@ CSS Ελεγκτή Εγκυρότητας.

rel="alternate">中文 -

- +

-Υποστηρίξτε το εργαλείο, γίνετε ένας υποστηρικτής
- + + +

-

- Πνευματικά Δικαιώματα © 1994-2009 - W3C® - - (MIT, - ERCIM, - Keio), - Με επιφύλαξη παντός δικαιώματος. - Εφαρμόζονται οι κανόνες της W3C για ευθύνη, - καταχωρημένο εμπορικό σήμα, - χρήση εγγράφου - - και άδεια χρήσης λογισμικού. Η αλληλεπίδραση σας με αυτόν τον ιστότοπο γίνεται σύμφωνα με τις δηλώσεις μας απορρήτου για δημόσια χρήση και για τα - Μέλη.

- +

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/manual.html.en b/manual.html.en index ce18aa071..73a147fa4 100644 --- a/manual.html.en +++ b/manual.html.en @@ -17,7 +17,7 @@

-

+

CSS Validation Service

Check Cascading Style Sheets (CSS) and (X)HTML documents with style sheets @@ -110,13 +110,13 @@ The simplest way to check a document is to use the basic interface. In this page

When using the basic interface, the validator will check the compliance - against CSS 2.1, which is the current + against CSS 2.1, which is the current CSS technical recommendation.
It will produce an XHTML output without any warning (you will only see errors).
The medium is set to "all", which is the medium suitable for all devices - (see - http://www.w3.org/TR/CSS2/media.html for a complete description of + (see + https://www.w3.org/TR/CSS2/media.html for a complete description of media).

@@ -152,10 +152,10 @@ The simplest way to check a document is to use the basic interface. In this page The CSS validator can check different CSS profiles. A profile lists all the features that an implementation on a particular platform is expected to implement. This definition is taken from - + the CSS site . The default choice corresponds to the current most used one: - CSS 2. + CSS 2.

Medium

@@ -163,8 +163,8 @@ The simplest way to check a document is to use the basic interface. In this page

The medium parameter is the equivalent of the @media rule, applying to all the document. You will find more information about media at - - http://www.w3.org/TR/CSS2/media.html + + https://www.w3.org/TR/CSS2/media.html .

@@ -176,7 +176,7 @@ CSS Validator.

If you want to use W3C's public validation server, use the parameters below in conjunction with the following base URI:
-http://jigsaw.w3.org/css-validator/validator
+https://jigsaw.w3.org/css-validator/validator
replace with the address of your own server if you want to call a private instance of the validator.

@@ -208,7 +208,7 @@ appreciated. thanks.

usermedium - The medium used + The medium used for the validation, like screen, print, braille... all @@ -376,42 +376,18 @@ appreciated. thanks.

- - - - - -

- - +

- - + +

-

- Copyright © 1994-2009 - W3C® - - (MIT, - ERCIM, - Keio), - All Rights Reserved. - W3C liability, - trademark, - document use - and software licensing - - rules apply. Your interactions with this site are in accordance - with our public and - Member privacy - statements. -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/manual.html.es b/manual.html.es index 043416861..7049933a4 100644 --- a/manual.html.es +++ b/manual.html.es @@ -17,7 +17,7 @@

-

+

Servicio de Validación de CSS

Check Cascading Style Sheets (CSS) and (X)HTML documents with style sheets @@ -73,7 +73,7 @@ La manera más sencilla de comprobar un documento es utilizar la interfaz básic Este documento puede ser HTML o CSS.

+ src="./images/uri_basic_es.png" alt="Validación mediante el formulario URI" />

Validación mediante carga de archivo

@@ -81,7 +81,7 @@ La manera más sencilla de comprobar un documento es utilizar la interfaz básic botón "Examinar..." y selecciona el archivo que deseas validar.

En este caso, sólo se permiten documentos CSS. Esto significa que no puedes @@ -95,7 +95,7 @@ La manera más sencilla de comprobar un documento es utilizar la interfaz básic Este modo es perfecto para probar fragmentos de CSS. Sólo tienes que escribir tu CSS en el área de texto

Los mismos comentarios de antes son de aplicación. Ten en cuenta que esta solución es @@ -108,11 +108,11 @@ La manera más sencilla de comprobar un documento es utilizar la interfaz básic

Cuando se utiliza la interfaz básica, el validador comprobará el cumplimiento - de CSS 2.1, que es la recomendación técnica + de CSS 2.1, que es la recomendación técnica actual de CSS.
Esto producirá una salida XHTML sin ninguna advertencia (únicamente verás los errores).
El parámetro medium está fijado en "all", que es el medio adecuado para todos los dispositivos - (ver + (ver http://www.w3.org/TR/CSS2/media.html para una descripción completa de los medios).

@@ -147,17 +147,17 @@ La manera más sencilla de comprobar un documento es utilizar la interfaz básic El validador CSS puede comprobar diferentes perfiles de CSS. Un perfil engloba todas las características que se esperan de una implementación en una plataforma determinada. Esta definición está tomada del - + sitio de CSS . La opción predeterminada corresponde al más utilizado en la actualidad: - CSS 2. + CSS 2.

Medium

El parámetro medium es el equivalente a la regla @media, aplicada a todo el documento. Encontrarás más información sobre medios en - + http://www.w3.org/TR/CSS2/media.html .

@@ -194,7 +194,7 @@ El servicio de validación de CSS es un servicio gratuito y público para todos, usermedium - Se utiliza medium para la + Se utiliza medium para la validación de medios como screen, print, braille... all @@ -364,32 +364,15 @@ El servicio de validación de CSS es un servicio gratuito y público para todos,

- +

- - + +

-

- Copyright © 1994-2009 - W3C® - - (MIT, - ERCIM, - Keio), - All Rights Reserved. - W3C liability, - trademark, - document use - and software licensing - - rules apply. Your interactions with this site are in accordance - with our public and - Member privacy - statements. -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/manual.html.fa b/manual.html.fa index 76f696506..5529b203d 100644 --- a/manual.html.fa +++ b/manual.html.fa @@ -15,7 +15,7 @@

-

سرویس اعتبار سنجی CSS

+

سرویس اعتبار سنجی CSS

محک زدن شیوه نامه های آبشاری (CSS) و اسناد X)HTML) حاوی شیوه نامه ها

@@ -101,13 +101,13 @@

اعتبار سنجی اصلی چه کاری را انجام می دهد؟

- هنگام کاربرد واسط اصلی، اعتبار سنج، مطلوبیت در برابر CSS 2 + هنگام کاربرد واسط اصلی، اعتبار سنج، مطلوبیت در برابر CSS 2 را بررسی خواهد نمود که توصیه ی تخصصی فعلی CSS می باشد.
اعتبار سنج یک خروجی XHTML را بدون هیچ اخطاری ایجاد می نماید (شما تنها خطاها را خواهید دید).
رسانه مجموعه ای "جامع" است، که واسطه ی مناسب برای تمام دستگاهها می باشد (جهت - توصیفی کامل از رسانه + توصیفی کامل از رسانه http://www.w3.org/TR/CSS2/media.html را ببینید).

@@ -144,9 +144,9 @@ اعتبار سنج CSS می تواند پروفایلهای متفاوت CSS را محک زند. یک فهرست پروفایل تمام ویژگی هایی که در یک پایگاه ویژه در انتظار اجرا می باشند را بکار می برد. این تعریف از - + سایت CSS استنباط می شود. گزینه ی پیش فرض با پر کاربردترین مورد فعلی مطابقت می نماید: - CSS 2. + CSS 2.

رسانه

@@ -154,7 +154,7 @@

پارامتر رسانه برابر با دستور media@، قابل استفاده برای کل سند است. شما اطلاعات بیشتری را در مورد رسانه در - + http://www.w3.org/TR/CSS2/media.html  می یابید.

@@ -198,7 +198,7 @@ CSS بکار برید وجود دارد.

usermedium -  رسانه بکار +  رسانه بکار رفته برای اعتبار سنجی، نظیر screen, print, braille... all @@ -326,55 +326,16 @@ CSS بکار برید وجود دارد.

- +

-حمایت از این ابزار و تبدیل شدن به
- + + +

-

- کلیه - حقوق چاپ و نشر © 1994-2007 - - W3C ® برای - - (MIT, - - ERCIM, - Keio)، - محفوظ است. - W3C ، رعایت قوانین مربوط به - - مارک تجاری، - استفاده - از سند و - مجوز - استفاده نرم افزار را - - الزامی نموده است. تعامل شما با این سایت بر اساس بیانیه اختصاصی - - اعضا و - - گروه ما می باشد.
- Copyright © 1994-2007 - W3C® - - (MIT, - ERCIM, - Keio), - All Rights Reserved. - W3C liability, - trademark, - document use - and software licensing - - rules apply. Your interactions with this site are in accordance - with our public and - Member privacy - statements. -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/manual.html.fr b/manual.html.fr index a8ef03c3c..33393c4af 100644 --- a/manual.html.fr +++ b/manual.html.fr @@ -16,7 +16,7 @@

-

+

Service de validation CSS

Check Cascading Style Sheets (CSS) and (X)HTML documents with style sheets @@ -91,10 +91,10 @@ vers l'adresse URL du résultat pour donner un jeu d'essais.

Que fait la validation de base ?

Avec l'interface de base, le validateur vérifiera la conformité vis-à-vis de la spécification -CSS 2, laquelle est la recommandation technique CSS actuelle.
+CSS 2, laquelle est la recommandation technique CSS actuelle.
Elle produira une sortie XHTML sans avertissement (vous ne verrez que les erreurs).
Le paramètre de média est réglé sur "all", c'est-à-dire une valeur qui correspond à tous les types d'appareil -(cf. http://www.w3.org/TR/CSS2/media.html pour une description complète des médias).

+(cf. http://www.w3.org/TR/CSS2/media.html pour une description complète des médias).

La validation évoluée

@@ -117,13 +117,13 @@ basculera sur la sienne par défaut, ce qui se traduira peut-être par un affich

Le validateur CSS peut vérifier des profils CSS différents. Un profil liste toutes les caractéristiques attendues d'une mise en œuvre sur une plateforme particulière. Cette définition est tirée du -site CSS. L'option par défaut correspond -au profil le plus utilisé : CSS 2.

+site CSS. L'option par défaut correspond +au profil le plus utilisé : CSS 2.

Média

Le paramètre de média équivaut à la règle @media qui s'applique à tout le document. Vous obtiendrez plus d'informations sur les types -de média à http://www.w3.org/TR/CSS2/media.html.

+de média à http://www.w3.org/TR/CSS2/media.html.

Pour les experts

@@ -158,7 +158,7 @@ du W3C est un service public gratuit, merci de le respecter.

usermedium -Le média à utiliser pour la validation, comme screen, +Le média à utiliser pour la validation, comme screen, print, braille, etc. all @@ -317,29 +317,17 @@ le validateur, voir l'API de service Web du validateur CSS<

- +

- - + +

-

-Copyright © 1994-2009 -W3C® -(MIT, -ERCIM, -Keio), tous droits réservés. -Les règles de responsabilité, -de nom de marque, -d'utilisation des documents -et d'octroi de licences logicielles -du W3C s'appliquent. Vos interactions avec ce site sont conformes à nos déclarations de confidentialité -publiques et vis-à-vis -de nos membres. -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

+

diff --git a/manual.html.hi b/manual.html.hi index 81bc1d218..c09403237 100644 --- a/manual.html.hi +++ b/manual.html.hi @@ -18,7 +18,7 @@

-

+

सीएसएस मान्यकरण सेवा

शैली (सीएसएस) शीट शैली पत्रक और के साथ (एक्स) HTML दस्तावेजों @@ -83,12 +83,12 @@

बुनियादी मान्यता क्या करता है?

-

बुनियादी अंतरफलक का उपयोग कर, जब मान्यकर्ता सीएसएस 2, जो वर्तमान तकनीकी +

बुनियादी अंतरफलक का उपयोग कर, जब मान्यकर्ता सीएसएस 2, जो वर्तमान तकनीकी सिफारिश सीएसएस के खिलाफ अनुपालन की जाँच करेगा.
यह किसी भी (आप केवल चेतावनी त्रुटियों देखेंगे बिना एक XHTML उत्पादन उपज) होगा.
मध्यम पर सेट है "सभी" है, जो सभी उपकरणों के लिए उपयुक्त है माध्यम (मीडिया - के पूर्ण विवरण के लिए http://www.w3.org/TR/CSS2/media.html देखें).

+ के पूर्ण विवरण के लिए http://www.w3.org/TR/CSS2/media.html देखें).

उन्नत मान्यकर्ता

@@ -113,14 +113,14 @@

प्रोफ़ाइल

सीएसएस सीएसएस validator अलग प्रोफाइल देख सकते हैं. एक प्रोफ़ाइल एक विशेष मंच पर एक कार्यान्वयन लागू करने के लिए आशा है कि सभी सुविधाओं को सूचीबद्ध - करती है. इस परिभाषा + करती है. इस परिभाषा सीएसएस साइट से लिया जाता है. डिफ़ॉल्ट विकल्प सबसे मौजूदा - एक प्रयोग किया जाता से मेल खाती है: सीएसएस 2

+ एक प्रयोग किया जाता से मेल खाती है: सीएसएस 2

मध्यम

मध्यम पैरामीटर @ मीडिया शासन के बराबर है, सभी दस्तावेज़ के लिए आवेदन. - आप + आप http://www.w3.org/TR/CSS2/media.html में मीडिया के बारे में अधिक जानकारी मिल जाएगी.

केवल विशेषज्ञों

@@ -156,7 +156,7 @@ http://www.w3.org/TR/CSS2/media.html में मीडिया के ब युसर्मेदियम - मध्यम + मध्यम सत्यापन के लिए प्रयोग किया जाता, जेसेकी screen, print, braille... all @@ -249,31 +249,16 @@ http://www.w3.org/TR/CSS2/media.html में मीडिया के ब

- - +

-

Support this tool, become a
- - -

-

- - Copyright © 1994-2007 - W3C® (MIT, - - - ERCIM, Keio), All Rights - Reserved. W3C - liability, - trademark, - - document use and - - software licensing rules apply. Your interactions with this site are in - accordance with our - public - and Member - privacy statements.

+ +

+ + + +

+ +

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/manual.html.it b/manual.html.it index 3188b3f1d..ea8e782eb 100644 --- a/manual.html.it +++ b/manual.html.it @@ -18,7 +18,7 @@

-

+

Servizio di validazione CSS

Check Cascading Style Sheets (CSS) and (X)HTML documents with style sheets @@ -99,9 +99,9 @@ Il metodo più semplice per verificare un documento è quello di utilizzare l'in

Cosa fa la validazione base?

- Quando si utilizza l'interfaccia base, il validatore effettuerà la verifica di conformità rispetto alla specifica CSS 2.1, ossia la raccomandazione attuale per i CSS.
+ Quando si utilizza l'interfaccia base, il validatore effettuerà la verifica di conformità rispetto alla specifica CSS 2.1, ossia la raccomandazione attuale per i CSS.
Tale visualizzazione produrrà una pagina XHTML senza nessun avviso (saranno visibili solamente gli errori).
- Il tipo di media selezionato è "all", ossia un tipo di media adatto per tutte le periferiche (consulta + Il tipo di media selezionato è "all", ossia un tipo di media adatto per tutte le periferiche (consulta http://www.w3.org/TR/CSS2/media.html per ottenere una descrizione completa sui diversi media).

@@ -124,17 +124,17 @@ Il metodo più semplice per verificare un documento è quello di utilizzare l'in

Il validatore CSS può verificare differenti profili CSS. Un profilo elenca tutte le caratteristiche che ci si aspetta di implementare in un'implementazione in una particolare piattaforma. Questa definizione è tratta dal - + sito sui CSS . La scelta predefinita corrisponde a quella più utilizzata: - CSS 2. + CSS 2.

Media

Il parametro media è l'equivalente della regola @media rule, applicata a tutto il documento. Troverai maggiori informazioni riguardo i media all'indirizzo - + http://www.w3.org/TR/CSS2/media.html .

@@ -170,7 +170,7 @@ Il servizio di validazione CSS è un servizio gratuito, pubblico e per tutti e p usermedium - Il tipo di media utilizzato per la validazione, ad esempio screen, + Il tipo di media utilizzato per la validazione, ad esempio screen, print, braille... all @@ -233,7 +233,7 @@ Il servizio di validazione CSS è un servizio gratuito, pubblico e per tutti e p

- +

@@ -335,32 +335,13 @@ Il servizio di validazione CSS è un servizio gratuito, pubblico e per tutti e p

- - - - - -

- - + +

-

- Copyright © 1994-2009 - W3C® - - (MIT, - ERCIM, - Keio), - Tutti i diritti riservati. - Si applicano le regole del W3C riguardanti la responsabilità, - marchi depositati, - l'utilizzo dei documenti - - e le licenze software. L'interazione con i contenuti di questi siti è in accordo con le nostre definizioni di pubblico e privato per quanto riguarda la riservatezza delle informazioni. -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/manual.html.ja b/manual.html.ja index e3df635ec..79f716824 100644 --- a/manual.html.ja +++ b/manual.html.ja @@ -17,7 +17,7 @@

-

+

CSS 検証サービス

Check Cascading Style Sheets (CSS) and (X)HTML documents with style sheets @@ -107,12 +107,12 @@

基本的な検証で行われること

- 基本インターフェースを使うと、Validator は CSS 2.1 に対する準拠具合を調べます。CSS2 は、現行の CSS に関する技術勧告です。
- 基本インターフェースを使うと、CSS 検証サービスは CSS 2.1 に対する準拠具合を調べます。CSS2 は、現行の CSS に関する技術勧告です。
+ 基本インターフェースを使うと、Validator は CSS 2.1 に対する準拠具合を調べます。CSS2 は、現行の CSS に関する技術勧告です。
+ 基本インターフェースを使うと、CSS 検証サービスは CSS 2.1 に対する準拠具合を調べます。CSS2 は、現行の CSS に関する技術勧告です。
この画面では、警告を出さずに(エラーのみ表示されます) XHTML で結果を表示します。
基本的な検証ではメディアは "all" に設定されますが、これはすべてのデバイスに適切なメディアです - (メディアについてのちゃんとした説明は http://www.w3.org/TR/CSS2/media.html を参照してください)。 + (メディアについてのちゃんとした説明は http://www.w3.org/TR/CSS2/media.html を参照してください)。

応用的な使い方

@@ -140,9 +140,9 @@ CSS 検証サービスは、数種類の CSS プロファイルをチェックすることができます。 プロファイルとは、あるプラットフォームが実装していると想定している機能のリストです。 プロファイルの定義は、 - CSS のサイト にあります。 + CSS のサイト にあります。 デフォルトでは、現在もっともよく使われている - CSS 2 が用いられます。 + CSS 2 が用いられます。

「メディア」パラメータ

@@ -150,7 +150,7 @@

メディアパラメータは、@media ルールと等価で、すべての文書に適用されます。 メディアについての詳細は - + http://www.w3.org/TR/CSS2/media.html にあります。

@@ -187,7 +187,7 @@ usermedium - 検査するのに用いるメディア。 + 検査するのに用いるメディア。 たとえば screen、print、braille…など。 all @@ -363,32 +363,16 @@

- +

- - + +

-

- Copyright © 1994-2009 - W3C® - - (MIT, - ERCIM, - 慶應義塾大学), - All Rights Reserved. - W3C の責任範囲、 - 商標、 - 文書の利用、 - そしてライセンス - - の規則が適用されます。 - このサイトの訪問者は、私たちの一般およびメンバープライバシー声明に従うものとします。 - -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/manual.html.ko b/manual.html.ko index 4cbd973f3..6ace6ce9a 100644 --- a/manual.html.ko +++ b/manual.html.ko @@ -17,7 +17,7 @@

-

+

CSS 검사 서비스

캐스케이딩 스타일시트 (CSS)와 스타일시트를 포함한 문서를 검사 @@ -103,10 +103,10 @@

기본 검사를 수행할 경우, 검사 서비스에서는 현재 CSS 기술에 있어서 권장되고 있고, 검증된 규약인 - CSS 2에 대한 유효성 검사를 수행하게 됩니다.
+ CSS 2에 대한 유효성 검사를 수행하게 됩니다.
이 경우에는 경고를 제외한 XHTML로 된 검사 결과를 표시합니다. (오류만 표시가 됩니다)
대상 매체는 모든 장치에서 사용할 수 있는 "all"에 대하여 검사를 수행합니다. (매체에 대한 자세한 내용은 - + http://www.w3.org/TR/CSS2/media.html에서 확인 가능합니다.)

@@ -136,17 +136,17 @@

CSS 검사 서비스에서는 서로 다른 CSS 프로파일에 대한 검사를 할 수 있습니다. 프로파일은 특정한 플랫폼에서 사용가능하거나 호환이 되어야 할 기능에 대한 명세를 합니다. 이 정의는 - + CSS 사이트 에 정의 되어 있습니다. 기본값으로는 가장 많이 사용되는 - CSS 2를 사용합니다. + CSS 2를 사용합니다.

매체 속성

매체 속성은 @media로 정의되는 규칙과 같은 것이며, 문서 전체에 대하여 적용됩니다. 이에 대한 보다 자세한 내용은 - + http://www.w3.org/TR/CSS2/media.html 에서 확인이 가능합니다.

@@ -184,7 +184,7 @@ usermedium screen, - print, braille과 같은 검사 대상 매체입니다. + print, braille과 같은 검사 대상 매체입니다. all @@ -349,33 +349,16 @@

- +

- - + +

-

- Copyright © 1994-2007 - W3C® - - (MIT, - ERCIM, - Keio), - All Rights Reserved. - W3C liability, - trademark, - document use - and software licensing - - rules apply. Your interactions with this site are in accordance - with our public and - Member privacy - statements. -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/manual.html.nl b/manual.html.nl index 82e07acfd..a9152bc3f 100644 --- a/manual.html.nl +++ b/manual.html.nl @@ -18,7 +18,7 @@

-

+

CSS Validation Service

Check Cascading Style Sheets (CSS) and (X)HTML documents with style sheets @@ -116,10 +116,10 @@ De makkelijkste manier om een document te checken is door de basis interface te

Als de basis interface gebruikt wordt, controleert de validator de geldigheid van de CSS - met CSS 2.1, de huidige CSS standaard.
+ met CSS 2.1, de huidige CSS standaard.
De validator produceert een XHTML output zonder waarschuwingen. (standaard krijg je alleen errors te zien)
Het medium is ingesteld op "all", want dit is het medium dat geschikt is voor alle apparaten. - (zie ook + (zie ook http://www.w3.org/TR/CSS2/media.html voor een complete beschrijving van de verschillende typen media)

@@ -155,10 +155,10 @@ De makkelijkste manier om een document te checken is door de basis interface te De CSS validator kan controleren op verschillende CSS profielen. Een profiel definieert alle functies die een implementatie op een specifiek platform zou moeten implementeren. Deze definitie wordt gehaald van - + de CSS webpagina . De standaard keuze correspondeert met het profiel dat op dit moment het meest wordt toegepast: - CSS 2. + CSS 2.

Medium

@@ -166,7 +166,7 @@ De makkelijkste manier om een document te checken is door de basis interface te

De parameter medium is hetzelfde als de @media regel, die wordt toegepast op het hele document. Je kunt meer informatie over media vinden op - + http://www.w3.org/TR/CSS2/media.html .

@@ -212,7 +212,7 @@ service voor iedereen, je respect wordt gewaardeerd. Bedankt.

usermedium - Het medium dat gebruikt + Het medium dat gebruikt wordt voor de validatie, zoals screen, print, braille... @@ -392,35 +392,16 @@ service voor iedereen, je respect wordt gewaardeerd. Bedankt.

- +

- - + +

-

- - Copyright © 1994-2009 - W3C® - - (MIT, - ERCIM, - Keio), - Alle Rechten Voorbehouden. - W3C aansprakelijkheid, - handelsmerk, - document gebruik - - en de software licentie - - regels zijn van toepassing. Je interacties met deze site zijn in overeenstemming - met onze publieke en - Member privacy - verklaringen. -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/manual.html.pl-PL b/manual.html.pl-PL index 020289e0e..eb99a9744 100644 --- a/manual.html.pl-PL +++ b/manual.html.pl-PL @@ -17,7 +17,7 @@

-

+

Usługa Walidacji CSS

Check Cascading Style Sheets (CSS) and (X)HTML documents with style sheets @@ -92,10 +92,10 @@ Najprostszym sposobem sprawdzenia dokumentu jest skorzystanie z podstawowego int

Co robi podstawowa walidacja?

- Używając podstawowego interfejsu walidator sprawdzi zgodność z CSS 2.1, który jest obecną rekomendacją techniczną CSS.
+ Używając podstawowego interfejsu walidator sprawdzi zgodność z CSS 2.1, który jest obecną rekomendacją techniczną CSS.
Poda on wynik w XHTML bez ostrzeżeń (widoczne będą jedynie błędy).
Medium ustawione jest na "wszystkie", co sprawia, że jest odpowiednie dla wyszystkich urządzeń - (zobacz stronę + (zobacz stronę http://www.w3.org/TR/CSS2/media.html aby uzyskać kompletny opis mediów).

@@ -114,14 +114,14 @@ Najprostszym sposobem sprawdzenia dokumentu jest skorzystanie z podstawowego int

Profile

- Walidator CSS może sprawdzić różne profile CSS. Profil wyszczególnia wszystkie cechy jakie implementacja na konkretnej platformie powinna zastosować. Definicja taka jest wzięta z - Witryny CSS. Domyślna opcja odpowiada obecnie najbardziej używanemu CSS 2. + Walidator CSS może sprawdzić różne profile CSS. Profil wyszczególnia wszystkie cechy jakie implementacja na konkretnej platformie powinna zastosować. Definicja taka jest wzięta z + Witryny CSS. Domyślna opcja odpowiada obecnie najbardziej używanemu CSS 2.

Medium

- Parametr medium jest równoważnikiem reguły @media stosującym się do całego dokumentu. Więcej informacji na temat mediów jest dostępnych na stronie + Parametr medium jest równoważnikiem reguły @media stosującym się do całego dokumentu. Więcej informacji na temat mediów jest dostępnych na stronie http://www.w3.org/TR/CSS2/media.html .

@@ -157,7 +157,7 @@ Usługa Walidatora CSS jest darmową usługą dla wszystkich - dziękujemy Ci i medium użytkownika - Medium użyte do walidacji takie jak: ekran, print, braille... + Medium użyte do walidacji takie jak: ekran, print, braille... Wszystkie @@ -322,33 +322,16 @@ Usługa Walidatora CSS jest darmową usługą dla wszystkich - dziękujemy Ci i

- +

- - + +

-

- Copyright © 1994-2009 - W3C® - - (MIT, - ERCIM, - Keio), - All Rights Reserved. - W3C liability, - trademark, - document use - and software licensing - - rules apply. Your interactions with this site are in accordance - with our public and - Member privacy - statements. -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/manual.html.pt-BR b/manual.html.pt-BR index cafd390d5..51fa9a1f9 100644 --- a/manual.html.pt-BR +++ b/manual.html.pt-BR @@ -17,7 +17,7 @@

-

+

Serviço de validação CSS

Verifica folhas de estilo em cascata (CSS) e documentos (X)HTML com folhas de estilo

@@ -94,10 +94,10 @@ A maneira mais simples de verificar um documento é pelo uso da interface básic

O que é validação básica?

- Ao usar a interface básica do validador, o documento é verificado para conformidade com as CSS 2, que é a recomendação corrente para as CSS.
+ Ao usar a interface básica do validador, o documento é verificado para conformidade com as CSS 2, que é a recomendação corrente para as CSS.
O relatório de resultados do validador é uma página XHTML mostrando somente os erros CSS (não há relatório de alertas).
A mídia é configurada para "todas", ou seja, o validador considera que a folha de estilo é servida para todos os dispositivos de usuário - (para uma descrição completa de tipos de mídia ver + (para uma descrição completa de tipos de mídia ver http://www.w3.org/TR/CSS2/media.html).

Validação avançada

@@ -118,15 +118,15 @@ A maneira mais simples de verificar um documento é pelo uso da interface básic

O validador CSS permite verificação para diferentes perfis. Um perfil é constituido de uma lista de funcionalidades próprias de uma determinada implementação e que se espera serem funcionais em uma plataforma específica. Esta definição consta do - + site CSS. O perfil padrão corresponde à especificação corrente e mais usada: - CSS 2.

+ CSS 2.

Mídia

O parâmetro mídia é equivalente à diretiva @media aplicada ao documento. Você encontra mais informações sobre mídia em - + http://www.w3.org/TR/CSS2/media.html .

Para especialistas

@@ -161,7 +161,7 @@ O serviço de validação CSS é gratuito e aberto a todos, usá-lo respeitando usermedium - A mídia usada para validar, como por exemplo: screen, + A mídia usada para validar, como por exemplo: screen, print, braille...(tela, impressora, braille...) all @@ -321,42 +321,19 @@ O serviço de validação CSS é gratuito e aberto a todos, usá-lo respeitando - - - - - -

- +

- - + +

-

- Copyright © 1994-2007 - W3C® - - (MIT, - ERCIM, - Keio), - All Rights Reserved. - W3C liability, - trademark, - document use - and software licensing - - rules apply. Your interactions with this site are in accordance - with our public and - Member privacy - statements. -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/manual.html.ro b/manual.html.ro index f72b37a91..3b9f16923 100644 --- a/manual.html.ro +++ b/manual.html.ro @@ -17,7 +17,7 @@

-

+

Serviciul de validare CSS

Verifica foile de lucru in cascada(CSS) si documentele (X)HTML @@ -99,9 +99,9 @@ Cel mai usor mod de a verifica un document este sa folosesti interfata de baza.

Ce face validarea de baza?

- Cand se foloseste interfata de baza, validatorul va compara cu CSS 2, care este recomandarea tehnica curenta pentru CSS.
+ Cand se foloseste interfata de baza, validatorul va compara cu CSS 2, care este recomandarea tehnica curenta pentru CSS.
Va produce un rezultat XHTML fara vreun avertisment (vei vedea numai erorile).
- Media este setata pentru "all", care este media indicata pentru toate dispozitivele(vezi + Media este setata pentru "all", care este media indicata pentru toate dispozitivele(vezi http://www.w3.org/TR/CSS2/media.html pentru o descriere completa a mediei).

@@ -122,16 +122,16 @@ Cel mai usor mod de a verifica un document este sa folosesti interfata de baza.

Validatorul CSS poate verifica diferite profile CSS. Un profil afiseaza toate trasaturile pe care o implementare pe o platforma anume le va implementa. Aceasta definitie se gaseste pe - + site-ul CSS. - Cea mai folosita si mai noua este: CSS 2. + Cea mai folosita si mai noua este: CSS 2.

Media

Parametrul mediu este echivalentul regulii @media, care se aplica intregului document. Vei gasi mai multe informatii la - + http://www.w3.org/TR/CSS2/media.html .

@@ -167,7 +167,7 @@ Serviciul de validare CSS este un serviciu gratuit, public pentru oricine, iar r usermedium - media folosita pentru validare, ca screen, + media folosita pentru validare, ca screen, print, braille... all @@ -285,32 +285,16 @@ Serviciul de validare CSS este un serviciu gratuit, public pentru oricine, iar r

- +

-Support this tool, become a
- + + +

-

- Copyright © 1994-2007 - W3C® - - (MIT, - ERCIM, - Keio), - All Rights Reserved. - W3C liability, - trademark, - document use - and software licensing - - rules apply. Your interactions with this site are in accordance - with our public and - Member privacy - statements. -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/manual.html.ru b/manual.html.ru index d3d785eb9..ab5692d13 100644 --- a/manual.html.ru +++ b/manual.html.ru @@ -17,7 +17,7 @@

-

+

Сервис проверки CSS

Проверка таблиц каскадных стилей (CSS) и документов (X)HTML с таблицами стилей @@ -85,9 +85,9 @@

Что делает основная проверка?

-

При использовании упрощенного интерфейса, сервис проверит документы на соответствие CSS 2 — текущей технической рекомендации для CSS.
+

При использовании упрощенного интерфейса, сервис проверит документы на соответствие CSS 2 — текущей технической рекомендации для CSS.
Он выдаст отчет в XHTML без каких-либо предупреждений (будет только информация об ошибках).
-Опция «среда» будет установлена в значение «all», что обозначает соответствие всем устройствам (смотрите http://www.w3.org/TR/CSS2/media.html для полного описания сред).

+Опция «среда» будет установлена в значение «all», что обозначает соответствие всем устройствам (смотрите http://www.w3.org/TR/CSS2/media.html для полного описания сред).

Расширенная проверка

@@ -101,11 +101,11 @@

Профиль

-

Сервис проверки может работать с различными профилями CSS. Профиль перечисляет все особенности и возможности реализации на конкретной платформе. Это определение взято с сайта CSS. Выбор по умолчанию соответствует наиболее часто используемому, CSS 2.

+

Сервис проверки может работать с различными профилями CSS. Профиль перечисляет все особенности и возможности реализации на конкретной платформе. Это определение взято с сайта CSS. Выбор по умолчанию соответствует наиболее часто используемому, CSS 2.

Носитель

-

Задание носителя соответствует правилу @media, применяющемуся ко всему документу. Вы можете найти больше информации о носителях по адресу http://www.w3.org/TR/CSS2/media.html.

+

Задание носителя соответствует правилу @media, применяющемуся ко всему документу. Вы можете найти больше информации о носителях по адресу http://www.w3.org/TR/CSS2/media.html.

Только для специалистов

@@ -138,7 +138,7 @@ usermedium - Среда, используемая для проверки; например. screen, print, braille... + Среда, используемая для проверки; например. screen, print, braille... all @@ -293,33 +293,16 @@

- +

- - + +

-

- Copyright © 1994-2007 - W3C® - - (MIT, - ERCIM, - Keio), - All Rights Reserved. - W3C liability, - trademark, - document use - and software licensing - - rules apply. Your interactions with this site are in accordance - with our public and - Member privacy - statements. -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/manual.html.sv b/manual.html.sv index 4f97ea63c..274fbacbf 100644 --- a/manual.html.sv +++ b/manual.html.sv @@ -17,7 +17,7 @@

-

+

CSS-valideringstjänst

Granska formatmallar (Cascading Style Sheets, CSS) och (X)HTML-dokument med formatmallar @@ -126,7 +126,7 @@ möjligheter: Då du använder det enkla gränssnittet så kommer valideraren att granska om din kod är korrekt enligt - CSS 2, som är den aktuella + CSS 2, som är den aktuella tekniska CSS-standarden.
Den genererar XHTML-utdata med beskrivning av felen, men ger inte @@ -134,7 +134,7 @@ möjligheter: Medium sätts till "all", som är det medium som är lämpligt för alla apparater (dokumentet - http://www.w3.org/TR/CSS2/media.html + http://www.w3.org/TR/CSS2/media.html ger en fullständig beskrivning av media).

@@ -187,10 +187,10 @@ möjligheter: implementation på en specifik plattform förväntas stödja. Denna definition tas från - CSS-webbplatsen . + CSS-webbplatsen . Standardvalet svarar mot den nu mest använda: - CSS 2. + CSS 2.

@@ -202,7 +202,7 @@ möjligheter: för hela dokumentet. Du hittar mer information om media på - http://www.w3.org/TR/CSS2/media.html. + http://www.w3.org/TR/CSS2/media.html.

@@ -275,7 +275,7 @@ möjligheter: usermedium - medium + medium som skall användas för validering, såsom screen, print, braille... @@ -476,33 +476,16 @@ möjligheter:

- +

- - + +

-

- Copyright © 1994-2007 - W3C® - - (MIT, - ERCIM, - Keio), - Rättigheter förbehållna. - W3C:s regler för - ansvar, - varumärke, - dokumentanvändning - och - programvarulicenser gäller. - Din interaktion med denna webbplats sker i enlighet med våra integritetspolicies för - allmänheten och - W3C:s medlemmar. -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/manual.html.uk b/manual.html.uk index 3e7077b77..4c666c6d9 100644 --- a/manual.html.uk +++ b/manual.html.uk @@ -17,7 +17,7 @@

-

+

Сервіс перевірки CSS

Перевірка таблиць каскадних стилів (CSS) та документів (X)HTML з таблицями стилів @@ -85,9 +85,9 @@

Що робить основна перевірка?

-

При використанні спрощеного інтерфейсу, сервіс перевірить документи на відповідність CSS 2 — поточній технічній рекомендації для CSS.
+

При використанні спрощеного інтерфейсу, сервіс перевірить документи на відповідність CSS 2 — поточній технічній рекомендації для CSS.
Він видасть звіт до XHTML без абияких попереджень (буде лише інформація про помилки).
-Опцію «середовище» буде встановлено у значення «all», що позначає відповідність усім пристроям (дивіться http://www.w3.org/TR/CSS2/media.html для повного опису середовищ).

+Опцію «середовище» буде встановлено у значення «all», що позначає відповідність усім пристроям (дивіться http://www.w3.org/TR/CSS2/media.html для повного опису середовищ).

Розширена перевірка

@@ -101,11 +101,11 @@

Профіль

-

Сервіс перевірки може функціонувати з різними профілями CSS. Профіль перераховує усі особливості й можливости реалізації на конкретній платформі. Це визначення взято з сайта CSS. Выбор за замовчуванням соответствует наиболее часто используемому, CSS 2.

+

Сервіс перевірки може функціонувати з різними профілями CSS. Профіль перераховує усі особливості й можливости реалізації на конкретній платформі. Це визначення взято з сайта CSS. Выбор за замовчуванням соответствует наиболее часто используемому, CSS 2.

Носій

-

Завдання носія відповідає правилу @media, що застосовується до всього документу. Ви можете знайти більше інформації про носії за адресою http://www.w3.org/TR/CSS2/media.html.

+

Завдання носія відповідає правилу @media, що застосовується до всього документу. Ви можете знайти більше інформації про носії за адресою http://www.w3.org/TR/CSS2/media.html.

Лише для спеціалістів

@@ -138,7 +138,7 @@ usermedium - Середовище, що використовується для перевірки; наприклад. screen, print, braille... + Середовище, що використовується для перевірки; наприклад. screen, print, braille... all @@ -237,31 +237,16 @@

- +

-

Підтримайте проект — внесіть пожертву.
- +

+ + +

-

- Copyright © 1994-2007 - W3C® - - (MIT, - ERCIM, - Keio), - All Rights Reserved. - W3C liability, - trademark, - document use - and software licensing - - rules apply. Your interactions with this site are in accordance - with our public and - Member privacy - statements. -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/manual.html.zh-cn b/manual.html.zh-cn index 55a034211..202ca2515 100644 --- a/manual.html.zh-cn +++ b/manual.html.zh-cn @@ -17,7 +17,7 @@

-

+

CSS Validation Service

Check Cascading Style Sheets (CSS) and (X)HTML documents with style sheets @@ -98,9 +98,9 @@

基本验证都作了什么工作？

- 当使用基本界面的时候，验证器会和CSS2的标准(目前最新的标准)进行比较，
你会看到一个XHTML格式的Error输出(不会包括警告)。 + 当使用基本界面的时候，验证器会和CSS2的标准(目前最新的标准)进行比较，
你会看到一个XHTML格式的Error输出(不会包括警告)。
- 媒介会设定到使用所有的设备媒介(对于媒介的描述请参考 + 媒介会设定到使用所有的设备媒介(对于媒介的描述请参考 http://www.w3.org/TR/CSS2/media.html)。

@@ -123,17 +123,17 @@

CSS验证器可以检查不同的CSS配置。所谓的配置列出了一系列某一个特定平台上的的特性。配置本身的定义可以参考 - + CSS站点 。默认的选择就是当前最常用的 - CSS 2.1标准. + CSS 2.1标准.

媒介

这个参数就等同于@media规则，适用于所有的文档。你可以在 - + http://www.w3.org/TR/CSS2/media.html 找到更多的关于媒介的资料。

@@ -169,7 +169,7 @@ usermedium - 指定用于被验证的媒介(medium)，例如screen, + 指定用于被验证的媒介(medium)，例如screen, print, braille... all @@ -341,32 +341,16 @@

- +

- - + +

-

- Copyright © 1994-2009 - W3C® - - (MIT, - ERCIM, - Keio), - All Rights Reserved. - W3C 责任, - 商标,已运用 - 文档授权 - - 和 软件授权 - - 相关规则。你与本站的互动是符合我们的公开 和 - 会员 隐私声明。 -

+

Copyright © 2025 World Wide Web Consortium.
W3C^® liability, trademark and permissive license rules apply.

diff --git a/org/w3c/css/atrules/css/AtRuleMedia.java b/org/w3c/css/atrules/css/AtRuleMedia.java index 5f335d0ae..ab61aebbd 100644 --- a/org/w3c/css/atrules/css/AtRuleMedia.java +++ b/org/w3c/css/atrules/css/AtRuleMedia.java @@ -31,10 +31,18 @@ public abstract AtRuleMedia addMedia(String restrictor, String medium, * Adds a media */ public AtRuleMedia addMedia(Media m) { - allMedia.add(m); + if (m != null) { + allMedia.add(m); + } return this; } + public void removeLastMedia() { + if (!allMedia.isEmpty()) { + allMedia.remove(allMedia.size() - 1); + } + } + /** * Add a media feature to the current media, like (color:1) * @@ -62,7 +70,7 @@ public ArrayList getMediaList() { public String getCurrentMedia() { if (!allMedia.isEmpty()) { - return allMedia.get(allMedia.size()-1).getMedia(); + return allMedia.get(allMedia.size() - 1).getMedia(); } return null; } @@ -85,6 +93,7 @@ public String lookupPrefix() { return ""; } + /** * Use to display the value part of the @media rule * used where the value is used, like as an option in @import diff --git a/org/w3c/css/atrules/css3/AtRuleMedia.java b/org/w3c/css/atrules/css3/AtRuleMedia.java index b2ea0d816..654eafd3b 100644 --- a/org/w3c/css/atrules/css3/AtRuleMedia.java +++ b/org/w3c/css/atrules/css3/AtRuleMedia.java @@ -80,7 +80,13 @@ public org.w3c.css.atrules.css.AtRuleMedia addMedia(String restrictor, String me */ public void addMediaFeature(MediaFeature feature, ApplContext ac) throws InvalidParamException { - Media latest = allMedia.get(allMedia.size() - 1); + Media latest; + if (allMedia.isEmpty()) { + latest = new Media(); + allMedia.add(latest); + } else { + latest = allMedia.get(allMedia.size() - 1); + } latest.addFeature(feature); } diff --git a/org/w3c/css/atrules/css3/media/MediaHorizontalViewportSegments.java b/org/w3c/css/atrules/css3/media/MediaHorizontalViewportSegments.java new file mode 100644 index 000000000..bc43517fd --- /dev/null +++ b/org/w3c/css/atrules/css3/media/MediaHorizontalViewportSegments.java @@ -0,0 +1,143 @@ +// $Id$ +// +// (c) COPYRIGHT MIT, ECRIM and Keio University, 2011 +// Please first read the full copyright statement in file COPYRIGHT.html + +package org.w3c.css.atrules.css3.media; + +import org.w3c.css.atrules.css.media.MediaFeature; +import org.w3c.css.atrules.css.media.MediaRangeFeature; +import org.w3c.css.util.ApplContext; +import org.w3c.css.util.InvalidParamException; +import org.w3c.css.values.CssComparator; +import org.w3c.css.values.CssExpression; +import org.w3c.css.values.CssTypes; +import org.w3c.css.values.CssValue; + +/** + * @spec https://www.w3.org/TR/2021/WD-mediaqueries-5-20211218/#descdef-media-horizontal-viewport-segments + */ +public class MediaHorizontalViewportSegments extends MediaRangeFeature { + + /** + * Create a new MediaHorizontalViewportSegments + */ + public MediaHorizontalViewportSegments() { + } + + /** + * Create a new MediaHorizontalViewportSegments. + * + * @param expression The expression for this media feature + * @throws InvalidParamException + * Values are incorrect + */ + public MediaHorizontalViewportSegments(ApplContext ac, String modifier, + CssExpression expression, boolean check) + throws InvalidParamException { + + if (expression != null) { + if (expression.getCount() > 1) { + throw new InvalidParamException("unrecognize", ac); + } + if (expression.getCount() == 0) { + throw new InvalidParamException("few-value", getFeatureName(), ac); + } + CssValue val = expression.getValue(); + + switch (val.getType()) { + case CssTypes.CSS_NUMBER: + value = checkValue(ac, expression, getFeatureName()); + break; + case CssTypes.CSS_COMPARATOR: + // mediaqueries-4 case, expand the comparator and check its value + if (modifier != null) { + throw new InvalidParamException("nomodifierrangemedia", + getFeatureName(), ac); + } + CssComparator p = (CssComparator) val; + value = checkValue(ac, p.getParameters(), getFeatureName()); + comparator = p.toString(); + expression.next(); + if (!expression.end()) { + val = expression.getValue(); + if (val.getType() != CssTypes.CSS_COMPARATOR) { + throw new InvalidParamException("unrecognize", ac); + } + CssComparator p2; + p2 = (CssComparator) val; + otherValue = checkValue(ac, p2.getParameters(), getFeatureName()); + otherComparator = p2.toString(); + checkComparators(ac, p, p2, getFeatureName()); + } + break; + default: + throw new InvalidParamException("value", expression.getValue(), + getFeatureName(), ac); + } + expression.next(); + setModifier(ac, modifier); + } else { + if (modifier != null) { + throw new InvalidParamException("nomodifiershortmedia", + getFeatureName(), ac); + } + } + } + + public MediaHorizontalViewportSegments(ApplContext ac, String modifier, CssExpression expression) + throws InvalidParamException { + this(ac, modifier, expression, false); + } + + static CssValue checkValue(ApplContext ac, CssExpression expression, String caller) + throws InvalidParamException { + if (expression.getCount() == 0) { + throw new InvalidParamException("few-value", caller, ac); + } + CssValue val = expression.getValue(); + CssValue value = null; + + switch (val.getType()) { + case CssTypes.CSS_NUMBER: + val.getCheckableValue().checkInteger(ac, caller); + value = val; + break; + default: + throw new InvalidParamException("value", expression.getValue(), + caller, ac); + } + return value; + } + + /** + * Returns the value of this media feature. + */ + + public Object get() { + return value; + } + + /** + * Returns the name of this media feature. + */ + public final String getFeatureName() { + return "horizontal-viewport-segments"; + } + + /** + * Compares two media features for equality. + * + * @param other The other media features. + */ + public boolean equals(MediaFeature other) { + try { + MediaHorizontalViewportSegments mm = (MediaHorizontalViewportSegments) other; + return (((value == null) && (mm.value == null)) || ((value != null) && value.equals(mm.value))) + && (((modifier == null) && (mm.modifier == null)) || ((modifier != null) && modifier.equals(mm.modifier))); + } catch (ClassCastException cce) { + return false; + } + + } +} diff --git a/org/w3c/css/atrules/css3/media/MediaPrefersContrast.java b/org/w3c/css/atrules/css3/media/MediaPrefersContrast.java index 9d4d8d78b..36b50f038 100644 --- a/org/w3c/css/atrules/css3/media/MediaPrefersContrast.java +++ b/org/w3c/css/atrules/css3/media/MediaPrefersContrast.java @@ -14,14 +14,14 @@ import org.w3c.css.values.CssValue; /** - * @spec https://www.w3.org/TR/2020/WD-mediaqueries-5-20200731/#descdef-media-prefers-contrast + * @spec https://www.w3.org/TR/2021/WD-mediaqueries-5-20211218/#prefers-contrast */ public class MediaPrefersContrast extends MediaFeature { public static final CssIdent[] allowed_values; static { - String[] _allowed_values = {"no-preference", "high", "low", "forced"}; + String[] _allowed_values = {"no-preference", "less", "more", "custom"}; allowed_values = new CssIdent[_allowed_values.length]; int i = 0; for (String s : _allowed_values) { diff --git a/org/w3c/css/atrules/css3/media/MediaVerticalViewportSegments.java b/org/w3c/css/atrules/css3/media/MediaVerticalViewportSegments.java new file mode 100644 index 000000000..a240a30af --- /dev/null +++ b/org/w3c/css/atrules/css3/media/MediaVerticalViewportSegments.java @@ -0,0 +1,143 @@ +// $Id$ +// +// (c) COPYRIGHT MIT, ECRIM and Keio University, 2011 +// Please first read the full copyright statement in file COPYRIGHT.html + +package org.w3c.css.atrules.css3.media; + +import org.w3c.css.atrules.css.media.MediaFeature; +import org.w3c.css.atrules.css.media.MediaRangeFeature; +import org.w3c.css.util.ApplContext; +import org.w3c.css.util.InvalidParamException; +import org.w3c.css.values.CssComparator; +import org.w3c.css.values.CssExpression; +import org.w3c.css.values.CssTypes; +import org.w3c.css.values.CssValue; + +/** + * @spec https://www.w3.org/TR/2021/WD-mediaqueries-5-20211218/#descdef-media-vertical-viewport-segments + */ +public class MediaVerticalViewportSegments extends MediaRangeFeature { + + /** + * Create a new MediaVerticalViewportSegments + */ + public MediaVerticalViewportSegments() { + } + + /** + * Create a new MediaVerticalViewportSegments. + * + * @param expression The expression for this media feature + * @throws InvalidParamException + * Values are incorrect + */ + public MediaVerticalViewportSegments(ApplContext ac, String modifier, + CssExpression expression, boolean check) + throws InvalidParamException { + + if (expression != null) { + if (expression.getCount() > 1) { + throw new InvalidParamException("unrecognize", ac); + } + if (expression.getCount() == 0) { + throw new InvalidParamException("few-value", getFeatureName(), ac); + } + CssValue val = expression.getValue(); + + switch (val.getType()) { + case CssTypes.CSS_NUMBER: + value = checkValue(ac, expression, getFeatureName()); + break; + case CssTypes.CSS_COMPARATOR: + // mediaqueries-4 case, expand the comparator and check its value + if (modifier != null) { + throw new InvalidParamException("nomodifierrangemedia", + getFeatureName(), ac); + } + CssComparator p = (CssComparator) val; + value = checkValue(ac, p.getParameters(), getFeatureName()); + comparator = p.toString(); + expression.next(); + if (!expression.end()) { + val = expression.getValue(); + if (val.getType() != CssTypes.CSS_COMPARATOR) { + throw new InvalidParamException("unrecognize", ac); + } + CssComparator p2; + p2 = (CssComparator) val; + otherValue = checkValue(ac, p2.getParameters(), getFeatureName()); + otherComparator = p2.toString(); + checkComparators(ac, p, p2, getFeatureName()); + } + break; + default: + throw new InvalidParamException("value", expression.getValue(), + getFeatureName(), ac); + } + expression.next(); + setModifier(ac, modifier); + } else { + if (modifier != null) { + throw new InvalidParamException("nomodifiershortmedia", + getFeatureName(), ac); + } + } + } + + public MediaVerticalViewportSegments(ApplContext ac, String modifier, CssExpression expression) + throws InvalidParamException { + this(ac, modifier, expression, false); + } + + static CssValue checkValue(ApplContext ac, CssExpression expression, String caller) + throws InvalidParamException { + if (expression.getCount() == 0) { + throw new InvalidParamException("few-value", caller, ac); + } + CssValue val = expression.getValue(); + CssValue value = null; + + switch (val.getType()) { + case CssTypes.CSS_NUMBER: + val.getCheckableValue().checkInteger(ac, caller); + value = val; + break; + default: + throw new InvalidParamException("value", expression.getValue(), + caller, ac); + } + return value; + } + + /** + * Returns the value of this media feature. + */ + + public Object get() { + return value; + } + + /** + * Returns the name of this media feature. + */ + public final String getFeatureName() { + return "vertical-viewport-segments"; + } + + /** + * Compares two media features for equality. + * + * @param other The other media features. + */ + public boolean equals(MediaFeature other) { + try { + MediaVerticalViewportSegments mm = (MediaVerticalViewportSegments) other; + return (((value == null) && (mm.value == null)) || ((value != null) && value.equals(mm.value))) + && (((modifier == null) && (mm.modifier == null)) || ((modifier != null) && modifier.equals(mm.modifier))); + } catch (ClassCastException cce) { + return false; + } + + } +} diff --git a/org/w3c/css/css/CssParser.java b/org/w3c/css/css/CssParser.java index f7a138e52..6f65e9663 100644 --- a/org/w3c/css/css/CssParser.java +++ b/org/w3c/css/css/CssParser.java @@ -13,6 +13,7 @@ import java.io.InputStream; import java.io.Reader; import java.net.URL; +import java.nio.charset.Charset; /** * This class describes how to implements your cascading @@ -81,6 +82,25 @@ public abstract void parseStyleElement(ApplContext ac, InputStream input, String title, String media, URL url, int lineno); + /** + * Parse a STYLE element. + * The real difference between this method and the precedent + * is that this method can take an InputStream. The URL is used + * to resolve import statement and URL statement in the style + * sheet. + * + * @param input the input stream. + * @param charset the charset for that input stream. + * @param title the title of the style element + * @param media the media of the style element + * @param url the URL where the input stream comes from. + * @param lineno The number line in the source document. It is used for error message + */ + public abstract void parseStyleElement(ApplContext ac, InputStream input, + Charset charset, + String title, String media, URL url, + int lineno); + /** * Parse a STYLE element. * The real difference between this method and the precedent diff --git a/org/w3c/css/css/StyleSheetGenerator.java b/org/w3c/css/css/StyleSheetGenerator.java index 69916845f..ceb78ff90 100644 --- a/org/w3c/css/css/StyleSheetGenerator.java +++ b/org/w3c/css/css/StyleSheetGenerator.java @@ -197,7 +197,8 @@ public StyleSheetGenerator(ApplContext ac, String title, StyleSheet style, produceError(); produceWarning(); - produceStyleSheet(); + if (CssValidator.showCSS) + produceStyleSheet(); try { String _template_dir = "org/w3c/css/css/"; diff --git a/org/w3c/css/css/StyleSheetParser.java b/org/w3c/css/css/StyleSheetParser.java index 35c3ebb10..70dcff87c 100644 --- a/org/w3c/css/css/StyleSheetParser.java +++ b/org/w3c/css/css/StyleSheetParser.java @@ -35,9 +35,11 @@ import java.io.InputStreamReader; import java.io.Reader; import java.io.StringReader; -import java.io.UnsupportedEncodingException; import java.lang.reflect.Constructor; import java.net.URL; +import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; +import java.nio.charset.UnsupportedCharsetException; import java.util.ArrayList; import java.util.StringTokenizer; @@ -48,6 +50,7 @@ public final class StyleSheetParser implements CssValidatorListener, CssParser { private static Constructor co = null; + private static boolean isPreprocessed; static { try { @@ -62,10 +65,15 @@ public final class StyleSheetParser CssFouffa cssFouffa; StyleSheet style = new StyleSheet(); - public StyleSheetParser(ApplContext ac) { + public StyleSheetParser(ApplContext ac, boolean isPreprocessed) { + this.isPreprocessed = isPreprocessed; ac.setStyleSheet(getStyleSheet()); } + public StyleSheetParser(ApplContext ac) { + new StyleSheetParser(ac, false); + } + public void reInit() { style = new StyleSheet(); } @@ -291,7 +299,8 @@ public void parseStyleElement(ApplContext ac, Reader reader, // if (cssFouffa == null) { String charset = ac.getCharsetForURL(url); - if (ac.getCssVersion().compareTo(CssVersion.CSS2) >=0 ) { + if (ac.getCssVersion().compareTo(CssVersion.CSS2) >=0 + && !isPreprocessed) { cssFouffa = new CssFouffa(ac, new UnescapeFilterReader(new BufferedReader(reader)), url, lineno); } else { cssFouffa = new CssFouffa(ac, reader, url, lineno); @@ -374,27 +383,45 @@ public void parseStyleElement(ApplContext ac, Reader reader, public void parseStyleElement(ApplContext ac, InputStream input, String title, String media, URL url, int lineno) { - InputStreamReader reader = null; + // FIXME better handling of charset using a charset detection library String charset = ac.getCharsetForURL(url); - try { - reader = new InputStreamReader(input, (charset == null) ? - "iso-8859-1" : charset); - } catch (UnsupportedEncodingException uex) { - Errors er = new Errors(); - er.addError(new org.w3c.css.parser.CssError(url.toString(), - -1, uex)); - notifyErrors(er); - } catch (Exception ex) { - // in case of error, ignore it. - reader = null; - if (Util.onDebug) { - System.err.println("Error in StyleSheet.parseStyleElement(" + title + "," - + url + "," + lineno + ")"); + Charset c = null; + if (charset == null) { + parseStyleElement(ac, input, null, title, + media, url, lineno); + } else { + try { + c = Charset.forName(charset); + } catch (UnsupportedCharsetException ucx) { + Errors er = new Errors(); + er.addError(new org.w3c.css.parser.CssError(url.toString(), + -1, ucx)); + notifyErrors(er); + } catch (Exception ex) { + // in case of error, ignore it. + if (Util.onDebug) { + System.err.println("Error in StyleSheet.parseStyleElement(" + title + "," + + url + "," + lineno + ")"); + } } + parseStyleElement(ac, input, c, title, media, url, lineno); } - if (reader != null) { - parseStyleElement(ac, reader, title, media, url, lineno); - } + } + + /** + * Parse a style element. The Style element always comes from the user + * + * @param input the input stream containing the style data + * @param url the name of the file the style element was read in. + * @throws IOException an IO error + */ + public void parseStyleElement(ApplContext ac, InputStream input, + Charset charset, + String title, String media, + URL url, int lineno) { + InputStreamReader reader = null; + reader = new InputStreamReader(input, (charset == null) ? StandardCharsets.ISO_8859_1 : charset); + parseStyleElement(ac, reader, title, media, url, lineno); } /** diff --git a/org/w3c/css/css/XMLStyleSheetHandler.java b/org/w3c/css/css/XMLStyleSheetHandler.java index b6213a48d..3f48fbd17 100644 --- a/org/w3c/css/css/XMLStyleSheetHandler.java +++ b/org/w3c/css/css/XMLStyleSheetHandler.java @@ -491,12 +491,12 @@ void parse(URL url) throws Exception { "http://xml.org/sax/features/namespace-prefixes", true); xmlParser.setFeature("http://xml.org/sax/features/validation", false); - /* - * xmlParser.setFeature("http://xml.org/sax/features/external-parameter-entities", - * false); - * xmlParser.setFeature("http://xml.org/sax/features/external-general-entities", - * false); - */ + /* readded 20250128, check report if things break */ + xmlParser.setFeature("http://xml.org/sax/features/external-parameter-entities", + false); + xmlParser.setFeature("http://xml.org/sax/features/external-general-entities", + false); + /* */ } catch (Exception ex) { ex.printStackTrace(); } diff --git a/org/w3c/css/css/text.properties b/org/w3c/css/css/text.properties index 68b0db78a..5e7aa18fb 100644 --- a/org/w3c/css/css/text.properties +++ b/org/w3c/css/css/text.properties @@ -10,17 +10,17 @@ $doc_validates_before_link $css $doc_validates_after_link $no_errors_interoperable_msg

- +

($no_errors_close_tags_msg) $no_errors_dl_local_msg $no_errors_create_link_msg - http://jigsaw.w3.org/css-validator/validator$link -or http://jigsaw.w3.org/css-validator/check/referer ($no_errors_forHTML_only_msg) + https://jigsaw.w3.org/css-validator/validator$link +or https://jigsaw.w3.org/css-validator/check/referer ($no_errors_forHTML_only_msg) ($no_errors_bookmark_msg) #end #else diff --git a/org/w3c/css/css/ucn.properties b/org/w3c/css/css/ucn.properties index 1f2d316a8..3b14308de 100644 --- a/org/w3c/css/css/ucn.properties +++ b/org/w3c/css/css/ucn.properties @@ -10,19 +10,19 @@

$no_errors_interoperable_msg

- +

<p>
-	<a href="http://jigsaw.w3.org/css-validator/check/referer">
+	<a href="https://jigsaw.w3.org/css-validator/check/referer">
 		<img style="border:0;width:88px;height:31px"
-			src="//jigsaw.w3.org/css-validator/images/vcss"
+			src="https://jigsaw.w3.org/css-validator/images/vcss"
 			alt="$valid_CSS" />
 	</a>
 </p>

- +

<p>
-	<a href="http://jigsaw.w3.org/css-validator/check/referer">
+	<a href="https://jigsaw.w3.org/css-validator/check/referer">
 		<img style="border:0;width:88px;height:31px"
-			src="//jigsaw.w3.org/css-validator/images/vcss-blue"
+			src="https://jigsaw.w3.org/css-validator/images/vcss-blue"
 			alt="$valid_CSS" />
 	</a>
 </p>

diff --git a/org/w3c/css/css/xhtml.properties b/org/w3c/css/css/xhtml.properties index 0a66c4884..accc32360 100644 --- a/org/w3c/css/css/xhtml.properties +++ b/org/w3c/css/css/xhtml.properties @@ -8,7 +8,7 @@ #if ( !$css ) #set ( $css = $cssversion ) #end - + @@ -57,42 +57,26 @@

 <p>
-#if ($file_title.trim().startsWith("https://"))
     <a href="https://jigsaw.w3.org/css-validator/check/referer">
         <img style="border:0;width:88px;height:31px"
             src="https://jigsaw.w3.org/css-validator/images/vcss"
             alt="$valid_CSS" />
     </a>
-#else
-    <a href="http://jigsaw.w3.org/css-validator/check/referer">
-        <img style="border:0;width:88px;height:31px"
-            src="http://jigsaw.w3.org/css-validator/images/vcss"
-            alt="$valid_CSS" />
-    </a>
-#end
 </p>
             

 <p>
-#if ($file_title.trim().startsWith("https://"))
     <a href="https://jigsaw.w3.org/css-validator/check/referer">
         <img style="border:0;width:88px;height:31px"
             src="https://jigsaw.w3.org/css-validator/images/vcss-blue"
             alt="$valid_CSS" />
     </a>
-#else
-<a href="http://jigsaw.w3.org/css-validator/check/referer">
-    <img style="border:0;width:88px;height:31px"
-        src="http://jigsaw.w3.org/css-validator/images/vcss-blue"
-        alt="$valid_CSS" />
-    </a>
-#end
 </p>
         

($no_errors_close_tags_msg)

-

+

$no_errors_dl_local_msg @@ -101,9 +85,9 @@

$no_errors_create_link_msg

-

http://jigsaw.w3.org/css-validator/validator$link
+
https://jigsaw.w3.org/css-validator/validator$link
 or
-http://jigsaw.w3.org/css-validator/check/referer ($no_errors_forHTML_only_msg)
+https://jigsaw.w3.org/css-validator/check/referer ($no_errors_forHTML_only_msg)
 
             
($no_errors_bookmark_msg)
         #end
@@ -187,7 +171,7 @@ http://jigsaw.w3.org/css-validator/check/referer ($no_errors_forHTML_only_msg)
     #end
 #end
 #if ($errors_count > 0)
-  

+  

 #end
 
 #if ($warnings_count > 0)
@@ -317,30 +301,14 @@ http://jigsaw.w3.org/css-validator/check/referer ($no_errors_forHTML_only_msg)
 #end
 

         

-            
+            
         
         

-        
-        
+        
+        
         
         
-        

-            Copyright
-            © 1994-2014
-            W3C®
-            (MIT,
-            ERCIM,
-            Keio,
-	   Beihang),
-            All Rights Reserved.
-            W3C liability,
-            trademark,
-            document use
-            and software licensing
-            rules apply. Your interactions with this site are in accordance
-            with our public and
-            Member privacy statements.
-        
+        
Copyright © 2025 World Wide Web Consortium.
 W3C® liability, trademark and permissive license rules apply.
 
     
 
diff --git a/org/w3c/css/error/error.html b/org/w3c/css/error/error.html
index 438883b2d..b99271fa9 100644
--- a/org/w3c/css/error/error.html
+++ b/org/w3c/css/error/error.html
@@ -9,7 +9,7 @@
 
   
     

-      
+      
     
     

     
CSS
diff --git a/org/w3c/css/index/IndexGenerator.java b/org/w3c/css/index/IndexGenerator.java
index b1c479336..924c56654 100644
--- a/org/w3c/css/index/IndexGenerator.java
+++ b/org/w3c/css/index/IndexGenerator.java
@@ -131,7 +131,7 @@ public static synchronized void generatesIndex(boolean servlet) {
                     ++count;
                 }
             }
-            Velocity.getLog().info("IndexGenerator : " + count + " index file(s) created or modified");
+    //        Velocity.getLog().info("IndexGenerator : " + count + " index file(s) created or modified");
             done = true;
         } catch (ResourceNotFoundException e) {
             e.printStackTrace();
diff --git a/org/w3c/css/index/footer.vm b/org/w3c/css/index/footer.vm
index be2af13ab..bde482284 100644
--- a/org/w3c/css/index/footer.vm
+++ b/org/w3c/css/index/footer.vm
@@ -26,32 +26,15 @@
 
 

    

-     
+     
    
    

-   
-   
+   
+   
    
    
 
-    

-      Copyright © 1994-2009
-      W3C®
-
-      (MIT,
-      ERCIM,
-      Keio),
-      All Rights Reserved.
-      W3C liability,
-      trademark,
-      document use
-      and software licensing
-
-      rules apply. Your interactions with this site are in accordance
-      with our public and
-      Member privacy
-      statements.
-    
+   
Copyright © 2025 World Wide Web Consortium.
 W3C® liability, trademark and permissive license rules apply.
 
   
 
diff --git a/org/w3c/css/index/header.vm b/org/w3c/css/index/header.vm
index 43fcecb04..5e6fa5dc6 100644
--- a/org/w3c/css/index/header.vm
+++ b/org/w3c/css/index/header.vm
@@ -22,7 +22,7 @@
 
   
    

-    

+    

     CSS Validation Service
     

       $check_CSS
diff --git a/org/w3c/css/index/translations.vm b/org/w3c/css/index/translations.vm
index 0a8cf9330..9ca87de3f 100644
--- a/org/w3c/css/index/translations.vm
+++ b/org/w3c/css/index/translations.vm
@@ -8,8 +8,8 @@
 
Translate the CSS validator in a new language
 
If the CSS validator is not yet available in your native language and you would like to translate it:
 

-  
Download the translation kit. Unpack the kit: It includes a number of HTML documents, a file with all the strings used for the validator messages, and a text files with instructions.
-  
Get in touch with us before you start translating: someone may already be on the job. Someone from the W3C staff or validator development team will get back to you with details about how to translate the validator.
+  
Download the translation kit. Unpack the kit: It includes a number of HTML documents, a file with all the strings used for the validator messages, and a text files with instructions.
+  
Get in touch with us before you start translating: someone may already be on the job. Someone from the W3C staff or validator development team will get back to you with details about how to translate the validator.
   
Translate. Congratulations, you have made the CSS validator more accessible to a lot more Web developers and designers.
 
 
diff --git a/org/w3c/css/index/validator.vm b/org/w3c/css/index/validator.vm
index 7d1471a7b..907d843a5 100644
--- a/org/w3c/css/index/validator.vm
+++ b/org/w3c/css/index/validator.vm
@@ -104,7 +104,7 @@
       

 
       

-        
$validate_by_URI
+        
$validate_by_URI
         

         

           $enter_uri:
@@ -120,7 +120,7 @@
       
 
       

-        
$validate_by_file_upload
+        
$validate_by_file_upload
       
         
$choose_document:
         

@@ -132,7 +132,7 @@
       
 
       

-        
$validate_by_input
+        
$validate_by_input
         
         
$enter_CSS:
         

@@ -145,7 +145,7 @@
       

   
 
   
-  

+  

 
   

   
$note: $note_xhtml_valid.
diff --git a/org/w3c/css/parser/CssPropertyFactory.java b/org/w3c/css/parser/CssPropertyFactory.java
index 3e94792be..7d578e839 100644
--- a/org/w3c/css/parser/CssPropertyFactory.java
+++ b/org/w3c/css/parser/CssPropertyFactory.java
@@ -7,7 +7,7 @@
 
 package org.w3c.css.parser;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.text.similarity.LevenshteinDistance;
 import org.w3c.css.atrules.css.AtRuleMedia;
 import org.w3c.css.atrules.css.media.Media;
 import org.w3c.css.atrules.css.media.MediaFeature;
@@ -328,6 +328,7 @@ private String setClassName(AtRule atRule, String media, ApplContext ac, String
     }
 
     private String findClosestPropertyName(AtRule atRule, ApplContext ac, String property) {
+        LevenshteinDistance levenshtein = LevenshteinDistance.getDefaultInstance();
         int mindist = 100000;
         int dist;
         Set propertyList = PropertiesLoader.getProfile(ac.getPropertyKey()).keySet();
@@ -339,7 +340,7 @@ private String findClosestPropertyName(AtRule atRule, ApplContext ac, String pro
             property = sb.toString();
         }
         for (String s : propertyList) {
-            dist = StringUtils.getLevenshteinDistance(property, s);
+            dist = levenshtein.apply(property, s);
             if (dist >= 0 && dist < mindist) {
                 bestFit = s;
                 mindist = dist;
diff --git a/org/w3c/css/parser/analyzer/CssParser.java b/org/w3c/css/parser/analyzer/CssParser.java
index cc6a97b52..35c29a097 100644
--- a/org/w3c/css/parser/analyzer/CssParser.java
+++ b/org/w3c/css/parser/analyzer/CssParser.java
@@ -46,7 +46,6 @@
 import org.w3c.css.values.CssBracket;
 import org.w3c.css.values.CssCalc;
 import org.w3c.css.values.CssCheckableValue;
-import org.w3c.css.values.CssClamp;
 import org.w3c.css.values.CssColor;
 import org.w3c.css.values.CssComparator;
 import org.w3c.css.values.CssExpression;
@@ -57,8 +56,7 @@
 import org.w3c.css.values.CssIdent;
 import org.w3c.css.values.CssImage;
 import org.w3c.css.values.CssLength;
-import org.w3c.css.values.CssMax;
-import org.w3c.css.values.CssMin;
+import org.w3c.css.values.CssMathFunction;
 import org.w3c.css.values.CssNumber;
 import org.w3c.css.values.CssOperator;
 import org.w3c.css.values.CssPercentage;
@@ -808,6 +806,7 @@ final public void nested_at_rules() throws ParseException {
       case HASH:
       case LBRACKET:
       case ANY:
+      case DOT:
       case COLON:
       case RELFONTLENGTH:
       case RELVIEWLENGTH:
@@ -818,8 +817,7 @@ final public void nested_at_rules() throws ParseException {
       case RESOLUTION:
       case DIMEN:
       case PSEUDOELEMENT_SYM:
-      case CLASS:
-      case 152:{
+      case 153:{
         ruleSet();
         break;
         }
@@ -1200,6 +1198,7 @@ final public void ignoreStatement() throws ParseException {
         case HASH:
         case LBRACKET:
         case ANY:
+        case DOT:
         case COLON:
         case RELFONTLENGTH:
         case RELVIEWLENGTH:
@@ -1221,8 +1220,7 @@ final public void ignoreStatement() throws ParseException {
         case SUPPORTS_SYM:
         case VIEWPORT_SYM:
         case ATKEYWORD:
-        case CLASS:
-        case 152:{
+        case 153:{
           ;
           break;
           }
@@ -1240,6 +1238,7 @@ final public void ignoreStatement() throws ParseException {
         case HASH:
         case LBRACKET:
         case ANY:
+        case DOT:
         case COLON:
         case RELFONTLENGTH:
         case RELVIEWLENGTH:
@@ -1250,8 +1249,7 @@ final public void ignoreStatement() throws ParseException {
         case RESOLUTION:
         case DIMEN:
         case PSEUDOELEMENT_SYM:
-        case CLASS:
-        case 152:{
+        case 153:{
           ruleSet();
           break;
           }
@@ -1768,6 +1766,10 @@ final public void mediaquerylist(AtRuleMedia mediaRule) throws ParseException {
             mediaRule.addMediaFeature(mf, ac);
             mf.setCombinator(comb);
             // mf.setParens();
+        } else {
+            if (defaultMedia) {
+                mediaRule.removeLastMedia();
+            }
         }
   }
 
@@ -1833,6 +1835,7 @@ final public void mediaquerylist(AtRuleMedia mediaRule) throws ParseException {
         case HASH:
         case LBRACKET:
         case ANY:
+        case DOT:
         case COLON:
         case RELFONTLENGTH:
         case RELVIEWLENGTH:
@@ -1854,8 +1857,7 @@ final public void mediaquerylist(AtRuleMedia mediaRule) throws ParseException {
         case SUPPORTS_SYM:
         case VIEWPORT_SYM:
         case ATKEYWORD:
-        case CLASS:
-        case 152:{
+        case 153:{
           ;
           break;
           }
@@ -1873,6 +1875,7 @@ final public void mediaquerylist(AtRuleMedia mediaRule) throws ParseException {
         case HASH:
         case LBRACKET:
         case ANY:
+        case DOT:
         case COLON:
         case RELFONTLENGTH:
         case RELVIEWLENGTH:
@@ -1883,8 +1886,7 @@ final public void mediaquerylist(AtRuleMedia mediaRule) throws ParseException {
         case RESOLUTION:
         case DIMEN:
         case PSEUDOELEMENT_SYM:
-        case CLASS:
-        case 152:{
+        case 153:{
           ruleSet();
           break;
           }
@@ -2100,19 +2102,19 @@ final public void mediaquerylist(AtRuleMedia mediaRule) throws ParseException {
       case LBRACKET:
       case RBRACKET:
       case ANY:
+      case DOT:
       case RPAREN:
       case LPAREN:
       case COLON:
       case ATKEYWORD:
-      case CLASS:
-      case 145:
       case 146:
       case 147:
       case 148:
       case 149:
       case 150:
       case 151:
-      case 152:{
+      case 152:
+      case 153:{
         p = declaration();
 f.setProperty(p);
         break;
@@ -3817,14 +3819,14 @@ final public char unaryOperator() throws ParseException {
     case RPAREN:
     case LPAREN:
     case COLON:
-    case 145:
     case 146:
     case 147:
     case 148:
     case 149:
     case 150:
     case 151:
-    case 152:{
+    case 152:
+    case 153:{
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case PLUS:
       case GREATER:
@@ -3843,14 +3845,14 @@ final public char unaryOperator() throws ParseException {
       case RPAREN:
       case LPAREN:
       case COLON:
-      case 145:
       case 146:
       case 147:
       case 148:
       case 149:
       case 150:
       case 151:
-      case 152:{
+      case 152:
+      case 153:{
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
         case PLUS:
         case GREATER:
@@ -3864,19 +3866,15 @@ final public char unaryOperator() throws ParseException {
         case RPAREN:
         case LPAREN:
         case COLON:
-        case 145:
         case 146:
         case 147:
         case 148:
         case 149:
         case 150:
         case 151:
-        case 152:{
+        case 152:
+        case 153:{
           switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-          case 145:{
-            hack = jj_consume_token(145);
-            break;
-            }
           case 146:{
             hack = jj_consume_token(146);
             break;
@@ -3905,6 +3903,10 @@ final public char unaryOperator() throws ParseException {
             hack = jj_consume_token(152);
             break;
             }
+          case 153:{
+            hack = jj_consume_token(153);
+            break;
+            }
           case ANY:{
             hack = jj_consume_token(ANY);
             break;
@@ -4003,15 +4005,16 @@ final public char unaryOperator() throws ParseException {
       break;
       }
     case HASHIDENT:
-    case ATKEYWORD:
-    case CLASS:{
+    case DOT:
+    case ATKEYWORD:{
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case HASHIDENT:{
         n = jj_consume_token(HASHIDENT);
         break;
         }
-      case CLASS:{
-        n = jj_consume_token(CLASS);
+      case DOT:{
+        jj_consume_token(DOT);
+        n = ident();
         break;
         }
       case ATKEYWORD:{
@@ -4130,6 +4133,9 @@ final public char unaryOperator() throws ParseException {
       context_set = selector_list();
       jj_consume_token(LBRACE);
 validSelector = (context_set.size() > 0);
+            if (validSelector) {
+                currentContext = context_set;
+            }
       label_116:
       while (true) {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -4258,19 +4264,19 @@ final public ArrayList declarations() throws ParseException {if(!va
     case LBRACKET:
     case RBRACKET:
     case ANY:
+    case DOT:
     case RPAREN:
     case LPAREN:
     case COLON:
     case ATKEYWORD:
-    case CLASS:
-    case 145:
     case 146:
     case 147:
     case 148:
     case 149:
     case 150:
     case 151:
-    case 152:{
+    case 152:
+    case 153:{
       values = declaration();
 if (values != null) {
                 value_set.add(values);
@@ -4327,19 +4333,19 @@ final public ArrayList declarations() throws ParseException {if(!va
       case LBRACKET:
       case RBRACKET:
       case ANY:
+      case DOT:
       case RPAREN:
       case LPAREN:
       case COLON:
       case ATKEYWORD:
-      case CLASS:
-      case 145:
       case 146:
       case 147:
       case 148:
       case 149:
       case 150:
       case 151:
-      case 152:{
+      case 152:
+      case 153:{
         values = declaration();
 if (values != null) {
                       value_set.add(values);
@@ -4390,9 +4396,21 @@ final public ArrayList declarations() throws ParseException {if(!va
     throw new Error("Missing return statement in function");
   }
 
-  final public CssSelectors relative_selector() throws ParseException {String comb;
+  final public CssSelectors relative_selector() throws ParseException {String comb = "*none*";
         CssSelectors current;
-    comb = combinator();
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case S:
+    case PLUS:
+    case GREATER:
+    case TILDE:
+    case TWOPIPES:{
+      comb = combinator();
+      break;
+      }
+    default:
+      jj_la1[172] = jj_gen;
+      ;
+    }
 current = new CssSelectors(ac);
                                switch(comb) {
                         case "+":
@@ -4407,6 +4425,8 @@ final public ArrayList declarations() throws ParseException {if(!va
                         case "||":
                                 current.addColumnCombinator();
                                 break;
+                        case "*none*":
+                                break;
                         default:
                                 current.addDescendantCombinator();
                 }
@@ -4429,7 +4449,7 @@ final public ArrayList declarations() throws ParseException {if(!va
         break;
         }
       default:
-        jj_la1[172] = jj_gen;
+        jj_la1[173] = jj_gen;
         break label_121;
       }
       label_122:
@@ -4441,7 +4461,7 @@ final public ArrayList declarations() throws ParseException {if(!va
           break;
           }
         default:
-          jj_la1[173] = jj_gen;
+          jj_la1[174] = jj_gen;
           break label_122;
         }
       }
@@ -4465,7 +4485,7 @@ final public ArrayList declarations() throws ParseException {if(!va
     case NOT:
     case IDENT:
     case ANY:
-    case 152:{
+    case 153:{
       type_selector(selector);
       label_123:
       while (true) {
@@ -4473,6 +4493,7 @@ final public ArrayList declarations() throws ParseException {if(!va
         case HASHIDENT:
         case HASH:
         case LBRACKET:
+        case DOT:
         case COLON:
         case RELFONTLENGTH:
         case RELVIEWLENGTH:
@@ -4482,13 +4503,12 @@ final public ArrayList declarations() throws ParseException {if(!va
         case FREQ:
         case RESOLUTION:
         case DIMEN:
-        case PSEUDOELEMENT_SYM:
-        case CLASS:{
+        case PSEUDOELEMENT_SYM:{
           ;
           break;
           }
         default:
-          jj_la1[174] = jj_gen;
+          jj_la1[175] = jj_gen;
           break label_123;
         }
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -4497,6 +4517,7 @@ final public ArrayList declarations() throws ParseException {if(!va
           id_selector(selector);
           break;
           }
+        case DOT:
         case RELFONTLENGTH:
         case RELVIEWLENGTH:
         case ABSOLUTLENGTH:
@@ -4504,8 +4525,7 @@ final public ArrayList declarations() throws ParseException {if(!va
         case TIME:
         case FREQ:
         case RESOLUTION:
-        case DIMEN:
-        case CLASS:{
+        case DIMEN:{
           class_selector(selector);
           break;
           }
@@ -4519,7 +4539,7 @@ final public ArrayList declarations() throws ParseException {if(!va
           break;
           }
         default:
-          jj_la1[175] = jj_gen;
+          jj_la1[176] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -4530,6 +4550,7 @@ final public ArrayList declarations() throws ParseException {if(!va
     case HASHIDENT:
     case HASH:
     case LBRACKET:
+    case DOT:
     case COLON:
     case RELFONTLENGTH:
     case RELVIEWLENGTH:
@@ -4539,8 +4560,7 @@ final public ArrayList declarations() throws ParseException {if(!va
     case FREQ:
     case RESOLUTION:
     case DIMEN:
-    case PSEUDOELEMENT_SYM:
-    case CLASS:{
+    case PSEUDOELEMENT_SYM:{
       label_124:
       while (true) {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -4549,6 +4569,7 @@ final public ArrayList declarations() throws ParseException {if(!va
           id_selector(selector);
           break;
           }
+        case DOT:
         case RELFONTLENGTH:
         case RELVIEWLENGTH:
         case ABSOLUTLENGTH:
@@ -4556,8 +4577,7 @@ final public ArrayList declarations() throws ParseException {if(!va
         case TIME:
         case FREQ:
         case RESOLUTION:
-        case DIMEN:
-        case CLASS:{
+        case DIMEN:{
           class_selector(selector);
           break;
           }
@@ -4571,7 +4591,7 @@ final public ArrayList declarations() throws ParseException {if(!va
           break;
           }
         default:
-          jj_la1[176] = jj_gen;
+          jj_la1[177] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -4579,6 +4599,7 @@ final public ArrayList declarations() throws ParseException {if(!va
         case HASHIDENT:
         case HASH:
         case LBRACKET:
+        case DOT:
         case COLON:
         case RELFONTLENGTH:
         case RELVIEWLENGTH:
@@ -4588,13 +4609,12 @@ final public ArrayList declarations() throws ParseException {if(!va
         case FREQ:
         case RESOLUTION:
         case DIMEN:
-        case PSEUDOELEMENT_SYM:
-        case CLASS:{
+        case PSEUDOELEMENT_SYM:{
           ;
           break;
           }
         default:
-          jj_la1[177] = jj_gen;
+          jj_la1[178] = jj_gen;
           break label_124;
         }
       }
@@ -4602,7 +4622,7 @@ final public ArrayList declarations() throws ParseException {if(!va
       break;
       }
     default:
-      jj_la1[178] = jj_gen;
+      jj_la1[179] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -4616,6 +4636,7 @@ final public CssSelectors subclass_selector(CssSelectors selector) throws ParseE
       id_selector(selector);
       break;
       }
+    case DOT:
     case RELFONTLENGTH:
     case RELVIEWLENGTH:
     case ABSOLUTLENGTH:
@@ -4623,8 +4644,7 @@ final public CssSelectors subclass_selector(CssSelectors selector) throws ParseE
     case TIME:
     case FREQ:
     case RESOLUTION:
-    case DIMEN:
-    case CLASS:{
+    case DIMEN:{
       class_selector(selector);
       break;
       }
@@ -4637,7 +4657,7 @@ final public CssSelectors subclass_selector(CssSelectors selector) throws ParseE
       break;
       }
     default:
-      jj_la1[179] = jj_gen;
+      jj_la1[180] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -4645,7 +4665,7 @@ final public CssSelectors subclass_selector(CssSelectors selector) throws ParseE
     throw new Error("Missing return statement in function");
   }
 
-  final public CssSelectors complex_selector(CssSelectors sel) throws ParseException {String comb;
+  final public CssSelectors complex_selector(CssSelectors sel) throws ParseException {String comb = "*none*";
         CssSelectors current;
     try {
       current = compound_selector(sel);
@@ -4693,13 +4713,15 @@ final public CssSelectors subclass_selector(CssSelectors selector) throws ParseE
                                 case "||":
                                         current.addColumnCombinator();
                                         break;
+                                case "*none*":
+                                        break;
                                 default:
                                         current.addDescendantCombinator();
                         }
           break;
           }
         default:
-          jj_la1[180] = jj_gen;
+          jj_la1[181] = jj_gen;
           ;
         }
         current = compound_selector(current);
@@ -4745,7 +4767,7 @@ final public CssSelectors subclass_selector(CssSelectors selector) throws ParseE
 
   final public CssSelectors compound_selector(CssSelectors next) throws ParseException {CssSelectors selector = new CssSelectors(ac, next);
         selector.setAtRule(getAtRule());
-    if (jj_2_18(3)) {
+    if (jj_2_15(4)) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case AND:
       case OR:
@@ -4753,36 +4775,60 @@ final public CssSelectors subclass_selector(CssSelectors selector) throws ParseE
       case NOT:
       case IDENT:
       case ANY:
-      case 152:{
+      case 153:{
         type_selector(selector);
         break;
         }
       default:
-        jj_la1[181] = jj_gen;
+        jj_la1[182] = jj_gen;
         ;
       }
       label_126:
       while (true) {
         subclass_selector(selector);
-        if (jj_2_11(2)) {
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case HASHIDENT:
+        case HASH:
+        case LBRACKET:
+        case DOT:
+        case COLON:
+        case RELFONTLENGTH:
+        case RELVIEWLENGTH:
+        case ABSOLUTLENGTH:
+        case ANGLE:
+        case TIME:
+        case FREQ:
+        case RESOLUTION:
+        case DIMEN:{
           ;
-        } else {
+          break;
+          }
+        default:
+          jj_la1[183] = jj_gen;
           break label_126;
         }
       }
       label_127:
       while (true) {
-        if (jj_2_12(2)) {
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case PSEUDOELEMENT_SYM:{
           ;
-        } else {
+          break;
+          }
+        default:
+          jj_la1[184] = jj_gen;
           break label_127;
         }
         pseudo_element_selector(selector);
         label_128:
         while (true) {
-          if (jj_2_13(2)) {
+          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case COLON:{
             ;
-          } else {
+            break;
+            }
+          default:
+            jj_la1[185] = jj_gen;
             break label_128;
           }
           pseudo_class_selector(selector);
@@ -4796,11 +4842,11 @@ final public CssSelectors subclass_selector(CssSelectors selector) throws ParseE
       case NOT:
       case IDENT:
       case ANY:
-      case 152:{
+      case 153:{
         type_selector(selector);
         label_129:
         while (true) {
-          if (jj_2_14(2)) {
+          if (jj_2_11(2)) {
             ;
           } else {
             break label_129;
@@ -4808,7 +4854,7 @@ final public CssSelectors subclass_selector(CssSelectors selector) throws ParseE
           pseudo_element_selector(selector);
           label_130:
           while (true) {
-            if (jj_2_15(2)) {
+            if (jj_2_12(2)) {
               ;
             } else {
               break label_130;
@@ -4824,14 +4870,14 @@ final public CssSelectors subclass_selector(CssSelectors selector) throws ParseE
           pseudo_element_selector(selector);
           label_132:
           while (true) {
-            if (jj_2_16(2)) {
+            if (jj_2_13(2)) {
               ;
             } else {
               break label_132;
             }
             pseudo_class_selector(selector);
           }
-          if (jj_2_17(2)) {
+          if (jj_2_14(2)) {
             ;
           } else {
             break label_131;
@@ -4840,7 +4886,7 @@ final public CssSelectors subclass_selector(CssSelectors selector) throws ParseE
         break;
         }
       default:
-        jj_la1[182] = jj_gen;
+        jj_la1[186] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -4854,13 +4900,11 @@ final public CssSelectors subclass_selector(CssSelectors selector) throws ParseE
  */
   final public void class_selector(CssSelectors s) throws ParseException {Token n;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case CLASS:{
-      /*  "." n= { */
-          n = jj_consume_token(CLASS);
+    case DOT:{
+      jj_consume_token(DOT);
+      n = ident();
 try {
-            s.addClass(new ClassSelector(convertClassIdent(n.image.substring(1))));
-            //        s.addAttribute("class", convertIdent(n.image.substring(1)),
-            //           CssSelectors.ATTRIBUTE_CLASS_SEL);
+            s.addClass(new ClassSelector(convertClassIdent(n.image)));
         } catch (InvalidParamException e) {
             //	    removeThisRule();
              ac.getFrame()
@@ -4938,7 +4982,7 @@ final public CssSelectors subclass_selector(CssSelectors selector) throws ParseE
       break;
       }
     default:
-      jj_la1[183] = jj_gen;
+      jj_la1[187] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -4979,7 +5023,7 @@ final public CssSelectors subclass_selector(CssSelectors selector) throws ParseE
       break;
       }
     default:
-      jj_la1[184] = jj_gen;
+      jj_la1[188] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -4993,7 +5037,7 @@ final public CssSelectors subclass_selector(CssSelectors selector) throws ParseE
   final public void type_selector(CssSelectors s) throws ParseException {Token n=null;
     Token p=null;
     String prefix = null;
-    if (jj_2_19(2)) {
+    if (jj_2_16(2)) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case AND:
       case OR:
@@ -5015,17 +5059,17 @@ final public CssSelectors subclass_selector(CssSelectors selector) throws ParseE
           break;
           }
         default:
-          jj_la1[185] = jj_gen;
+          jj_la1[189] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
         break;
         }
       default:
-        jj_la1[186] = jj_gen;
+        jj_la1[190] = jj_gen;
         ;
       }
-      p = jj_consume_token(152);
+      p = jj_consume_token(153);
     } else {
       ;
     }
@@ -5082,7 +5126,7 @@ final public CssSelectors subclass_selector(CssSelectors selector) throws ParseE
       break;
       }
     default:
-      jj_la1[187] = jj_gen;
+      jj_la1[191] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -5105,12 +5149,12 @@ final public CssSelectors subclass_selector(CssSelectors selector) throws ParseE
         break;
         }
       default:
-        jj_la1[188] = jj_gen;
+        jj_la1[192] = jj_gen;
         break label_133;
       }
       jj_consume_token(S);
     }
-    if (jj_2_20(2)) {
+    if (jj_2_17(2)) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case AND:
       case OR:
@@ -5132,17 +5176,17 @@ final public CssSelectors subclass_selector(CssSelectors selector) throws ParseE
           break;
           }
         default:
-          jj_la1[189] = jj_gen;
+          jj_la1[193] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
         break;
         }
       default:
-        jj_la1[190] = jj_gen;
+        jj_la1[194] = jj_gen;
         ;
       }
-      jj_consume_token(152);
+      jj_consume_token(153);
     } else {
       ;
     }
@@ -5155,7 +5199,7 @@ final public CssSelectors subclass_selector(CssSelectors selector) throws ParseE
         break;
         }
       default:
-        jj_la1[191] = jj_gen;
+        jj_la1[195] = jj_gen;
         break label_134;
       }
       jj_consume_token(S);
@@ -5199,7 +5243,7 @@ final public CssSelectors subclass_selector(CssSelectors selector) throws ParseE
         break;
         }
       default:
-        jj_la1[192] = jj_gen;
+        jj_la1[196] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -5211,7 +5255,7 @@ final public CssSelectors subclass_selector(CssSelectors selector) throws ParseE
           break;
           }
         default:
-          jj_la1[193] = jj_gen;
+          jj_la1[197] = jj_gen;
           break label_135;
         }
         jj_consume_token(S);
@@ -5232,11 +5276,11 @@ final public CssSelectors subclass_selector(CssSelectors selector) throws ParseE
         break;
         }
       default:
-        jj_la1[194] = jj_gen;
+        jj_la1[198] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
-      if (jj_2_21(2)) {
+      if (jj_2_18(2)) {
         label_136:
         while (true) {
           jj_consume_token(S);
@@ -5246,7 +5290,7 @@ final public CssSelectors subclass_selector(CssSelectors selector) throws ParseE
             break;
             }
           default:
-            jj_la1[195] = jj_gen;
+            jj_la1[199] = jj_gen;
             break label_136;
           }
         }
@@ -5262,7 +5306,7 @@ final public CssSelectors subclass_selector(CssSelectors selector) throws ParseE
           break;
           }
         default:
-          jj_la1[196] = jj_gen;
+          jj_la1[200] = jj_gen;
           break label_137;
         }
         jj_consume_token(S);
@@ -5270,7 +5314,7 @@ final public CssSelectors subclass_selector(CssSelectors selector) throws ParseE
       break;
       }
     default:
-      jj_la1[197] = jj_gen;
+      jj_la1[201] = jj_gen;
       ;
     }
     jj_consume_token(RBRACKET);
@@ -5405,7 +5449,7 @@ final public CssSelectors subclass_selector(CssSelectors selector) throws ParseE
           break;
           }
         default:
-          jj_la1[198] = jj_gen;
+          jj_la1[202] = jj_gen;
           break label_138;
         }
         jj_consume_token(S);
@@ -5419,7 +5463,7 @@ final public CssSelectors subclass_selector(CssSelectors selector) throws ParseE
           break;
           }
         default:
-          jj_la1[199] = jj_gen;
+          jj_la1[203] = jj_gen;
           break label_139;
         }
         jj_consume_token(S);
@@ -5437,7 +5481,7 @@ final public CssSelectors subclass_selector(CssSelectors selector) throws ParseE
       break;
       }
     default:
-      jj_la1[200] = jj_gen;
+      jj_la1[204] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -5454,7 +5498,7 @@ final public void pseudo(CssSelectors s) throws ParseException {
       break;
       }
     default:
-      jj_la1[201] = jj_gen;
+      jj_la1[205] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -5519,7 +5563,7 @@ final public void pseudo(CssSelectors s) throws ParseException {
           break;
           }
         default:
-          jj_la1[202] = jj_gen;
+          jj_la1[206] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -5531,7 +5575,7 @@ final public void pseudo(CssSelectors s) throws ParseException {
             break;
             }
           default:
-            jj_la1[203] = jj_gen;
+            jj_la1[207] = jj_gen;
             break label_140;
           }
           jj_consume_token(S);
@@ -5559,7 +5603,7 @@ final public void pseudo(CssSelectors s) throws ParseException {
           break;
           }
         default:
-          jj_la1[204] = jj_gen;
+          jj_la1[208] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -5571,7 +5615,7 @@ final public void pseudo(CssSelectors s) throws ParseException {
             break;
             }
           default:
-            jj_la1[205] = jj_gen;
+            jj_la1[209] = jj_gen;
             break label_141;
           }
           jj_consume_token(S);
@@ -5585,7 +5629,7 @@ final public void pseudo(CssSelectors s) throws ParseException {
             break;
             }
           default:
-            jj_la1[206] = jj_gen;
+            jj_la1[210] = jj_gen;
             break label_142;
           }
           jj_consume_token(S);
@@ -5609,7 +5653,7 @@ final public void pseudo(CssSelectors s) throws ParseException {
             break;
             }
           default:
-            jj_la1[207] = jj_gen;
+            jj_la1[211] = jj_gen;
             break label_143;
           }
           jj_consume_token(S);
@@ -5624,7 +5668,7 @@ final public void pseudo(CssSelectors s) throws ParseException {
               break;
               }
             default:
-              jj_la1[208] = jj_gen;
+              jj_la1[212] = jj_gen;
               break label_144;
             }
             jj_consume_token(S);
@@ -5653,7 +5697,7 @@ final public void pseudo(CssSelectors s) throws ParseException {
             break;
             }
           default:
-            jj_la1[209] = jj_gen;
+            jj_la1[213] = jj_gen;
             break label_145;
           }
           jj_consume_token(S);
@@ -5679,7 +5723,7 @@ final public void pseudo(CssSelectors s) throws ParseException {
           break;
           }
         default:
-          jj_la1[210] = jj_gen;
+          jj_la1[214] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -5691,7 +5735,7 @@ final public void pseudo(CssSelectors s) throws ParseException {
             break;
             }
           default:
-            jj_la1[211] = jj_gen;
+            jj_la1[215] = jj_gen;
             break label_146;
           }
           jj_consume_token(S);
@@ -5705,7 +5749,7 @@ final public void pseudo(CssSelectors s) throws ParseException {
             break;
             }
           default:
-            jj_la1[212] = jj_gen;
+            jj_la1[216] = jj_gen;
             break label_147;
           }
           jj_consume_token(S);
@@ -5743,7 +5787,7 @@ final public void pseudo(CssSelectors s) throws ParseException {
           break;
           }
         default:
-          jj_la1[213] = jj_gen;
+          jj_la1[217] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -5755,7 +5799,7 @@ final public void pseudo(CssSelectors s) throws ParseException {
             break;
             }
           default:
-            jj_la1[214] = jj_gen;
+            jj_la1[218] = jj_gen;
             break label_148;
           }
           jj_consume_token(S);
@@ -5780,7 +5824,7 @@ final public void pseudo(CssSelectors s) throws ParseException {
               break;
               }
             default:
-              jj_la1[215] = jj_gen;
+              jj_la1[219] = jj_gen;
               break label_149;
             }
             jj_consume_token(S);
@@ -5800,7 +5844,7 @@ final public void pseudo(CssSelectors s) throws ParseException {
                 break;
                 }
               default:
-                jj_la1[216] = jj_gen;
+                jj_la1[220] = jj_gen;
                 break label_150;
               }
               jj_consume_token(S);
@@ -5814,7 +5858,7 @@ final public void pseudo(CssSelectors s) throws ParseException {
                 break;
                 }
               default:
-                jj_la1[217] = jj_gen;
+                jj_la1[221] = jj_gen;
                 break label_151;
               }
               jj_consume_token(S);
@@ -5822,13 +5866,13 @@ final public void pseudo(CssSelectors s) throws ParseException {
             break;
             }
           default:
-            jj_la1[218] = jj_gen;
+            jj_la1[222] = jj_gen;
             ;
           }
           break;
           }
         default:
-          jj_la1[219] = jj_gen;
+          jj_la1[223] = jj_gen;
           error_str = skip_to_matching_paren();
         }
 try {
@@ -5856,7 +5900,7 @@ final public void pseudo(CssSelectors s) throws ParseException {
           break;
           }
         default:
-          jj_la1[220] = jj_gen;
+          jj_la1[224] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -5868,7 +5912,7 @@ final public void pseudo(CssSelectors s) throws ParseException {
             break;
             }
           default:
-            jj_la1[221] = jj_gen;
+            jj_la1[225] = jj_gen;
             break label_152;
           }
           jj_consume_token(S);
@@ -5893,7 +5937,7 @@ final public void pseudo(CssSelectors s) throws ParseException {
               break;
               }
             default:
-              jj_la1[222] = jj_gen;
+              jj_la1[226] = jj_gen;
               break label_153;
             }
             jj_consume_token(S);
@@ -5901,7 +5945,7 @@ final public void pseudo(CssSelectors s) throws ParseException {
           break;
           }
         default:
-          jj_la1[223] = jj_gen;
+          jj_la1[227] = jj_gen;
           error_str = skip_to_matching_paren();
         }
 try {
@@ -5924,7 +5968,7 @@ final public void pseudo(CssSelectors s) throws ParseException {
             break;
             }
           default:
-            jj_la1[224] = jj_gen;
+            jj_la1[228] = jj_gen;
             break label_154;
           }
           jj_consume_token(S);
@@ -5942,7 +5986,7 @@ final public void pseudo(CssSelectors s) throws ParseException {
         break;
         }
       default:
-        jj_la1[225] = jj_gen;
+        jj_la1[229] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -5950,7 +5994,7 @@ final public void pseudo(CssSelectors s) throws ParseException {
       break;
       }
     default:
-      jj_la1[226] = jj_gen;
+      jj_la1[230] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -6031,7 +6075,7 @@ final public void pseudo(CssSelectors s) throws ParseException {
       break;
       }
     default:
-      jj_la1[227] = jj_gen;
+      jj_la1[231] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -6057,7 +6101,7 @@ final public void pseudo(CssSelectors s) throws ParseException {
             break;
             }
           default:
-            jj_la1[228] = jj_gen;
+            jj_la1[232] = jj_gen;
             break label_155;
           }
           jj_consume_token(S);
@@ -6069,13 +6113,13 @@ final public void pseudo(CssSelectors s) throws ParseException {
           break;
           }
         default:
-          jj_la1[229] = jj_gen;
+          jj_la1[233] = jj_gen;
           ;
         }
         break;
         }
       default:
-        jj_la1[230] = jj_gen;
+        jj_la1[234] = jj_gen;
         ;
       }
 try {
@@ -6116,7 +6160,7 @@ final public void pseudo(CssSelectors s) throws ParseException {
  * @exception ParseException exception during the parse
  */
   final public CssProperty declaration() throws ParseException {String string_property;
-  CssExpression values;
+  CssExpression values = null;
   boolean important = false;
     try {
       string_property = property();
@@ -6129,19 +6173,66 @@ final public void pseudo(CssSelectors s) throws ParseException {
           break;
           }
         default:
-          jj_la1[231] = jj_gen;
+          jj_la1[235] = jj_gen;
           break label_156;
         }
         jj_consume_token(S);
       }
-      values = expr();
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case PLUS:
+      case MINUS:
+      case AND:
+      case OR:
+      case ONLY:
+      case NOT:
+      case STRING:
+      case IDENT:
+      case HASHIDENT:
+      case HASH:
+      case PROGID:
+      case DIV:
+      case LBRACKET:
+      case RBRACKET:
+      case URL:
+      case RELFONTLENGTH:
+      case RELVIEWLENGTH:
+      case ABSOLUTLENGTH:
+      case FLEX:
+      case ANGLE:
+      case SPL:
+      case ST:
+      case TIME:
+      case FREQ:
+      case RESOLUTION:
+      case DIMEN_9:
+      case DIMEN:
+      case PERCENTAGE:
+      case NUMBER:
+      case IMPORTANT_NOT:
+      case UNICODERANGE:
+      case FUNCTIONCALC:
+      case FUNCTIONMATHN:
+      case FUNCTIONMATH1:
+      case FUNCTIONMATH2:
+      case FUNCTIONROUND:
+      case FUNCTIONCLAMP:
+      case FUNCTIONATTR:
+      case FUNCTIONVAR:
+      case FUNCTION:{
+        values = expr();
+        break;
+        }
+      default:
+        jj_la1[236] = jj_gen;
+        ;
+      }
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case IMPORTANT_SYM:{
         important = prio();
         break;
         }
       default:
-        jj_la1[232] = jj_gen;
+        jj_la1[237] = jj_gen;
         ;
       }
 try {
@@ -6153,14 +6244,21 @@ final public void pseudo(CssSelectors s) throws ParseException {
             if (incompatible_error) {
                 {if (true) throw new InvalidParamException("notforcss1", "inherit", ac);}
             }
-
-            if (values.getCount() != 0) {
+            if (values == null) {
+                if (string_property.startsWith("--")) {
+                        values = new CssExpression();
+                } else {
+                        // old behaviour for empty properties
+                        {if (true) throw new ParseException();}
+                }
+            }
+            if (values.getCount() != 0 || string_property.startsWith("--")) {
                 CssProperty p = handleDeclaration(string_property.toLowerCase(),
                                                   values, important);
                 // Did the property recognize all values in the expression ?
 
                 if (!values.end() && ac.getMedium() == null) {
-                        addError(new InvalidParamException("unrecognize", "", ac),
+                   addError(new InvalidParamException("unrecognize", "", ac),
                              values);
                 } else {
                     // ok, return the new property
@@ -6209,7 +6307,7 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[233] = jj_gen;
+        jj_la1[238] = jj_gen;
         break label_157;
       }
       jj_consume_token(S);
@@ -6264,7 +6362,7 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[234] = jj_gen;
+        jj_la1[239] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -6276,7 +6374,7 @@ final public boolean prio() throws ParseException {
           break;
           }
         default:
-          jj_la1[235] = jj_gen;
+          jj_la1[240] = jj_gen;
           break label_159;
         }
         jj_consume_token(S);
@@ -6297,7 +6395,7 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[236] = jj_gen;
+        jj_la1[241] = jj_gen;
         break label_158;
       }
     }
@@ -6313,7 +6411,7 @@ final public boolean prio() throws ParseException {
       term(values);
       label_160:
       while (true) {
-        if (jj_2_22(2)) {
+        if (jj_2_19(2)) {
           ;
         } else {
           break label_160;
@@ -6347,12 +6445,12 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[237] = jj_gen;
+        jj_la1[242] = jj_gen;
         break label_161;
       }
       jj_consume_token(S);
     }
-    if (jj_2_23(3)) {
+    if (jj_2_20(3)) {
       n = ident();
 nameIsFirst = true;
       label_162:
@@ -6363,7 +6461,7 @@ final public boolean prio() throws ParseException {
           break;
           }
         default:
-          jj_la1[238] = jj_gen;
+          jj_la1[243] = jj_gen;
           break label_162;
         }
         jj_consume_token(S);
@@ -6381,16 +6479,16 @@ final public boolean prio() throws ParseException {
         c1 = jj_consume_token(EQ);
         break;
         }
-      case 151:{
-        c1 = jj_consume_token(151);
+      case 152:{
+        c1 = jj_consume_token(152);
         break;
         }
-      case 153:{
-        c1 = jj_consume_token(153);
+      case 154:{
+        c1 = jj_consume_token(154);
         break;
         }
       default:
-        jj_la1[239] = jj_gen;
+        jj_la1[244] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -6402,7 +6500,7 @@ final public boolean prio() throws ParseException {
           break;
           }
         default:
-          jj_la1[240] = jj_gen;
+          jj_la1[245] = jj_gen;
           break label_163;
         }
         jj_consume_token(S);
@@ -6438,8 +6536,10 @@ final public boolean prio() throws ParseException {
       case IMPORTANT_NOT:
       case UNICODERANGE:
       case FUNCTIONCALC:
-      case FUNCTIONMIN:
-      case FUNCTIONMAX:
+      case FUNCTIONMATHN:
+      case FUNCTIONMATH1:
+      case FUNCTIONMATH2:
+      case FUNCTIONROUND:
       case FUNCTIONCLAMP:
       case FUNCTION:{
         val1 = mediaexpr();
@@ -6456,16 +6556,16 @@ final public boolean prio() throws ParseException {
           c1 = jj_consume_token(EQ);
           break;
           }
-        case 151:{
-          c1 = jj_consume_token(151);
+        case 152:{
+          c1 = jj_consume_token(152);
           break;
           }
-        case 153:{
-          c1 = jj_consume_token(153);
+        case 154:{
+          c1 = jj_consume_token(154);
           break;
           }
         default:
-          jj_la1[241] = jj_gen;
+          jj_la1[246] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -6477,7 +6577,7 @@ final public boolean prio() throws ParseException {
             break;
             }
           default:
-            jj_la1[242] = jj_gen;
+            jj_la1[247] = jj_gen;
             break label_164;
           }
           jj_consume_token(S);
@@ -6491,7 +6591,7 @@ final public boolean prio() throws ParseException {
             break;
             }
           default:
-            jj_la1[243] = jj_gen;
+            jj_la1[248] = jj_gen;
             break label_165;
           }
           jj_consume_token(S);
@@ -6500,8 +6600,8 @@ final public boolean prio() throws ParseException {
         case GREATER:
         case GREATEREQ:
         case EQ:
-        case 151:
-        case 153:{
+        case 152:
+        case 154:{
           switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
           case GREATER:{
             c2 = jj_consume_token(GREATER);
@@ -6515,16 +6615,16 @@ final public boolean prio() throws ParseException {
             c2 = jj_consume_token(EQ);
             break;
             }
-          case 151:{
-            c2 = jj_consume_token(151);
+          case 152:{
+            c2 = jj_consume_token(152);
             break;
             }
-          case 153:{
-            c2 = jj_consume_token(153);
+          case 154:{
+            c2 = jj_consume_token(154);
             break;
             }
           default:
-            jj_la1[244] = jj_gen;
+            jj_la1[249] = jj_gen;
             jj_consume_token(-1);
             throw new ParseException();
           }
@@ -6536,7 +6636,7 @@ final public boolean prio() throws ParseException {
               break;
               }
             default:
-              jj_la1[245] = jj_gen;
+              jj_la1[250] = jj_gen;
               break label_166;
             }
             jj_consume_token(S);
@@ -6545,13 +6645,13 @@ final public boolean prio() throws ParseException {
           break;
           }
         default:
-          jj_la1[246] = jj_gen;
+          jj_la1[251] = jj_gen;
           ;
         }
         break;
         }
       default:
-        jj_la1[247] = jj_gen;
+        jj_la1[252] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -6565,7 +6665,7 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[248] = jj_gen;
+        jj_la1[253] = jj_gen;
         break label_167;
       }
       jj_consume_token(S);
@@ -6605,7 +6705,7 @@ final public boolean prio() throws ParseException {
     mediaterm(values);
     label_168:
     while (true) {
-      if (jj_2_24(2)) {
+      if (jj_2_21(2)) {
         ;
       } else {
         break label_168;
@@ -6649,7 +6749,7 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[249] = jj_gen;
+        jj_la1[254] = jj_gen;
         ;
       }
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -6755,7 +6855,7 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[250] = jj_gen;
+        jj_la1[255] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -6775,8 +6875,10 @@ final public boolean prio() throws ParseException {
     case URL:
     case UNICODERANGE:
     case FUNCTIONCALC:
-    case FUNCTIONMIN:
-    case FUNCTIONMAX:
+    case FUNCTIONMATHN:
+    case FUNCTIONMATH1:
+    case FUNCTIONMATH2:
+    case FUNCTIONROUND:
     case FUNCTIONCLAMP:
     case FUNCTIONATTR:
     case FUNCTIONVAR:
@@ -6787,13 +6889,11 @@ final public boolean prio() throws ParseException {
 setValue(func, exp, operator, null, FUNCTIONCALC);
         break;
         }
-      case FUNCTIONMAX:{
-        func = mathmax();
-setValue(func, exp, operator, null, FUNCTION);
-        break;
-        }
-      case FUNCTIONMIN:{
-        func = mathmin();
+      case FUNCTIONMATHN:
+      case FUNCTIONMATH1:
+      case FUNCTIONMATH2:
+      case FUNCTIONROUND:{
+        func = mathfunction();
 setValue(func, exp, operator, null, FUNCTION);
         break;
         }
@@ -6839,7 +6939,7 @@ final public boolean prio() throws ParseException {
           break;
           }
         default:
-          jj_la1[251] = jj_gen;
+          jj_la1[256] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -6893,20 +6993,20 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[252] = jj_gen;
+        jj_la1[257] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
       break;
       }
     default:
-      jj_la1[253] = jj_gen;
+      jj_la1[258] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
     label_169:
     while (true) {
-      if (jj_2_25(2)) {
+      if (jj_2_22(2)) {
         ;
       } else {
         break label_169;
@@ -6940,8 +7040,10 @@ final public boolean prio() throws ParseException {
     case NUMBER:
     case IMPORTANT_NOT:
     case FUNCTIONCALC:
-    case FUNCTIONMIN:
-    case FUNCTIONMAX:
+    case FUNCTIONMATHN:
+    case FUNCTIONMATH1:
+    case FUNCTIONMATH2:
+    case FUNCTIONROUND:
     case FUNCTIONCLAMP:
     case FUNCTION:{
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -6951,12 +7053,12 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[254] = jj_gen;
+        jj_la1[259] = jj_gen;
         ;
       }
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case NUMBER:{
-        if (jj_2_26(2147483647)) {
+        if (jj_2_23(2147483647)) {
           ratio(exp, operator);
         } else {
           switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -6966,7 +7068,7 @@ final public boolean prio() throws ParseException {
             break;
             }
           default:
-            jj_la1[255] = jj_gen;
+            jj_la1[260] = jj_gen;
             jj_consume_token(-1);
             throw new ParseException();
           }
@@ -7061,8 +7163,10 @@ final public boolean prio() throws ParseException {
         break;
         }
       case FUNCTIONCALC:
-      case FUNCTIONMIN:
-      case FUNCTIONMAX:
+      case FUNCTIONMATHN:
+      case FUNCTIONMATH1:
+      case FUNCTIONMATH2:
+      case FUNCTIONROUND:
       case FUNCTIONCLAMP:
       case FUNCTION:{
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -7076,13 +7180,11 @@ final public boolean prio() throws ParseException {
 setValue(func, exp, operator, null, FUNCTIONCALC);
           break;
           }
-        case FUNCTIONMAX:{
-          func = mathmax();
-setValue(func, exp, operator, null, FUNCTION);
-          break;
-          }
-        case FUNCTIONMIN:{
-          func = mathmin();
+        case FUNCTIONMATHN:
+        case FUNCTIONMATH1:
+        case FUNCTIONMATH2:
+        case FUNCTIONROUND:{
+          func = mathfunction();
 setValue(func, exp, operator, null, FUNCTION);
           break;
           }
@@ -7092,14 +7194,14 @@ final public boolean prio() throws ParseException {
           break;
           }
         default:
-          jj_la1[256] = jj_gen;
+          jj_la1[261] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
         break;
         }
       default:
-        jj_la1[257] = jj_gen;
+        jj_la1[262] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -7111,7 +7213,7 @@ final public boolean prio() throws ParseException {
           break;
           }
         default:
-          jj_la1[258] = jj_gen;
+          jj_la1[263] = jj_gen;
           break label_170;
         }
         jj_consume_token(S);
@@ -7182,7 +7284,7 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[259] = jj_gen;
+        jj_la1[264] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -7194,7 +7296,7 @@ final public boolean prio() throws ParseException {
           break;
           }
         default:
-          jj_la1[260] = jj_gen;
+          jj_la1[265] = jj_gen;
           break label_171;
         }
         jj_consume_token(S);
@@ -7202,16 +7304,43 @@ final public boolean prio() throws ParseException {
       break;
       }
     default:
-      jj_la1[261] = jj_gen;
+      jj_la1[266] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+  }
+
+  final public CssCheckableValue mathfunction() throws ParseException {CssCheckableValue v;
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case FUNCTIONMATH1:{
+      v = mathfunction1();
+      break;
+      }
+    case FUNCTIONMATH2:{
+      v = mathfunction2();
+      break;
+      }
+    case FUNCTIONMATHN:{
+      v = mathfunctionn();
+      break;
+      }
+    case FUNCTIONROUND:{
+      v = mathfunctionround();
+      break;
+      }
+    default:
+      jj_la1[267] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
+{if ("" != null) return v;}
+    throw new Error("Missing return statement in function");
   }
 
-  final public CssCheckableValue mathmin() throws ParseException {CssCheckableValue v;
-    CssMin c;
+  final public CssCheckableValue mathfunctionn() throws ParseException {CssCheckableValue v;
+    CssMathFunction c;
     Token n;
-    n = jj_consume_token(FUNCTIONMIN);
+    n = jj_consume_token(FUNCTIONMATHN);
     label_172:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -7220,17 +7349,13 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[262] = jj_gen;
+        jj_la1[268] = jj_gen;
         break label_172;
       }
       jj_consume_token(S);
     }
     v = mathsum();
-if (v.getRawType() != CssTypes.CSS_MIN) {
-           c = new CssMin(v);
-        } else {
-           c = (CssMin) v;
-        }
+c = new CssMathFunction(ac, n.image, v);
     label_173:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -7239,7 +7364,7 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[263] = jj_gen;
+        jj_la1[269] = jj_gen;
         break label_173;
       }
       jj_consume_token(S);
@@ -7252,7 +7377,7 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[264] = jj_gen;
+        jj_la1[270] = jj_gen;
         break label_174;
       }
       jj_consume_token(COMMA);
@@ -7264,7 +7389,7 @@ final public boolean prio() throws ParseException {
           break;
           }
         default:
-          jj_la1[265] = jj_gen;
+          jj_la1[271] = jj_gen;
           break label_175;
         }
         jj_consume_token(S);
@@ -7279,7 +7404,7 @@ final public boolean prio() throws ParseException {
           break;
           }
         default:
-          jj_la1[266] = jj_gen;
+          jj_la1[272] = jj_gen;
           break label_176;
         }
         jj_consume_token(S);
@@ -7291,10 +7416,11 @@ final public boolean prio() throws ParseException {
     throw new Error("Missing return statement in function");
   }
 
-  final public CssCheckableValue mathmax() throws ParseException {CssCheckableValue v;
-    CssMax c;
+  final public CssCheckableValue mathfunctionround() throws ParseException {CssCheckableValue v;
+    CssMathFunction c;
     Token n;
-    n = jj_consume_token(FUNCTIONMAX);
+    n = jj_consume_token(FUNCTIONROUND);
+c = new CssMathFunction(ac, n.image);
     label_177:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -7303,26 +7429,56 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[267] = jj_gen;
+        jj_la1[273] = jj_gen;
         break label_177;
       }
       jj_consume_token(S);
     }
-    v = mathsum();
-if (v.getRawType() != CssTypes.CSS_MAX) {
-           c = new CssMax(v);
-        } else {
-           c = (CssMax) v;
-        }
-    label_178:
-    while (true) {
+    if (jj_2_24(2)) {
+      n = jj_consume_token(IDENT);
+c.addValue(CssIdent.getIdent(convertIdent(n.image)));
+    } else {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case S:{
+      case PLUS:
+      case MINUS:
+      case IDENT:
+      case LPAREN:
+      case RELFONTLENGTH:
+      case RELVIEWLENGTH:
+      case ABSOLUTLENGTH:
+      case FLEX:
+      case ANGLE:
+      case TIME:
+      case FREQ:
+      case PERCENTAGE:
+      case NUMBER:
+      case FUNCTIONCALC:
+      case FUNCTIONMATHN:
+      case FUNCTIONMATH1:
+      case FUNCTIONMATH2:
+      case FUNCTIONROUND:
+      case FUNCTIONCLAMP:
+      case FUNCTIONATTR:
+      case FUNCTIONVAR:{
+        v = mathsum();
+c.addValue(v);
+        break;
+        }
+      default:
+        jj_la1[274] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+    }
+    label_178:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case S:{
         ;
         break;
         }
       default:
-        jj_la1[268] = jj_gen;
+        jj_la1[275] = jj_gen;
         break label_178;
       }
       jj_consume_token(S);
@@ -7335,7 +7491,7 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[269] = jj_gen;
+        jj_la1[276] = jj_gen;
         break label_179;
       }
       jj_consume_token(COMMA);
@@ -7347,7 +7503,7 @@ final public boolean prio() throws ParseException {
           break;
           }
         default:
-          jj_la1[270] = jj_gen;
+          jj_la1[277] = jj_gen;
           break label_180;
         }
         jj_consume_token(S);
@@ -7362,7 +7518,7 @@ final public boolean prio() throws ParseException {
           break;
           }
         default:
-          jj_la1[271] = jj_gen;
+          jj_la1[278] = jj_gen;
           break label_181;
         }
         jj_consume_token(S);
@@ -7374,10 +7530,10 @@ final public boolean prio() throws ParseException {
     throw new Error("Missing return statement in function");
   }
 
-  final public CssCheckableValue mathclamp() throws ParseException {CssCheckableValue v1, v2, v3;
-CssClamp c;
-Token n;
-    n = jj_consume_token(FUNCTIONCLAMP);
+  final public CssCheckableValue mathfunction1() throws ParseException {CssCheckableValue v;
+    CssMathFunction c;
+    Token n;
+    n = jj_consume_token(FUNCTIONMATH1);
     label_182:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -7386,12 +7542,13 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[272] = jj_gen;
+        jj_la1[279] = jj_gen;
         break label_182;
       }
       jj_consume_token(S);
     }
-    v1 = mathsum();
+    v = mathsum();
+c = new CssMathFunction(ac, n.image, v);
     label_183:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -7400,12 +7557,21 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[273] = jj_gen;
+        jj_la1[280] = jj_gen;
         break label_183;
       }
       jj_consume_token(S);
     }
-    jj_consume_token(COMMA);
+    jj_consume_token(RPAREN);
+c.validate();
+    {if ("" != null) return c;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public CssCheckableValue mathfunction2() throws ParseException {CssCheckableValue v;
+    CssMathFunction c;
+    Token n;
+    n = jj_consume_token(FUNCTIONMATH2);
     label_184:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -7414,12 +7580,13 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[274] = jj_gen;
+        jj_la1[281] = jj_gen;
         break label_184;
       }
       jj_consume_token(S);
     }
-    v2 = mathsum();
+    v = mathsum();
+c = new CssMathFunction(ac, n.image, v);
     label_185:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -7428,13 +7595,87 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[275] = jj_gen;
+        jj_la1[282] = jj_gen;
         break label_185;
       }
       jj_consume_token(S);
     }
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case COMMA:{
+      jj_consume_token(COMMA);
+      label_186:
+      while (true) {
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case S:{
+          ;
+          break;
+          }
+        default:
+          jj_la1[283] = jj_gen;
+          break label_186;
+        }
+        jj_consume_token(S);
+      }
+      v = mathsum();
+c.addValue(v);
+      label_187:
+      while (true) {
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case S:{
+          ;
+          break;
+          }
+        default:
+          jj_la1[284] = jj_gen;
+          break label_187;
+        }
+        jj_consume_token(S);
+      }
+      break;
+      }
+    default:
+      jj_la1[285] = jj_gen;
+      ;
+    }
+    jj_consume_token(RPAREN);
+c.validate();
+    {if ("" != null) return c;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public CssCheckableValue mathclamp() throws ParseException {CssCheckableValue v1, v2, v3;
+    CssMathFunction c;
+    Token n;
+    n = jj_consume_token(FUNCTIONCLAMP);
+    label_188:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case S:{
+        ;
+        break;
+        }
+      default:
+        jj_la1[286] = jj_gen;
+        break label_188;
+      }
+      jj_consume_token(S);
+    }
+    v1 = mathsum();
+    label_189:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case S:{
+        ;
+        break;
+        }
+      default:
+        jj_la1[287] = jj_gen;
+        break label_189;
+      }
+      jj_consume_token(S);
+    }
     jj_consume_token(COMMA);
-    label_186:
+    label_190:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case S:{
@@ -7442,13 +7683,41 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[276] = jj_gen;
-        break label_186;
+        jj_la1[288] = jj_gen;
+        break label_190;
+      }
+      jj_consume_token(S);
+    }
+    v2 = mathsum();
+    label_191:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case S:{
+        ;
+        break;
+        }
+      default:
+        jj_la1[289] = jj_gen;
+        break label_191;
+      }
+      jj_consume_token(S);
+    }
+    jj_consume_token(COMMA);
+    label_192:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case S:{
+        ;
+        break;
+        }
+      default:
+        jj_la1[290] = jj_gen;
+        break label_192;
       }
       jj_consume_token(S);
     }
     v3 = mathsum();
-    label_187:
+    label_193:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case S:{
@@ -7456,13 +7725,16 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[277] = jj_gen;
-        break label_187;
+        jj_la1[291] = jj_gen;
+        break label_193;
       }
       jj_consume_token(S);
     }
     jj_consume_token(RPAREN);
-c = new CssClamp(ac, v1, v2, v3);
+c = new CssMathFunction(ac, n.image);
+        c.addValue(v1);
+        c.addValue(v2);
+        c.addValue(v3);
         c.validate();
         {if ("" != null) return c;}
     throw new Error("Missing return statement in function");
@@ -7472,7 +7744,7 @@ final public boolean prio() throws ParseException {
 CssCalc c;
 Token n;
     n = jj_consume_token(FUNCTIONCALC);
-    label_188:
+    label_194:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case S:{
@@ -7480,13 +7752,13 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[278] = jj_gen;
-        break label_188;
+        jj_la1[292] = jj_gen;
+        break label_194;
       }
       jj_consume_token(S);
     }
     v = mathsum();
-    label_189:
+    label_195:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case S:{
@@ -7494,8 +7766,8 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[279] = jj_gen;
-        break label_189;
+        jj_la1[293] = jj_gen;
+        break label_195;
       }
       jj_consume_token(S);
     }
@@ -7531,12 +7803,12 @@ final public boolean prio() throws ParseException {
     v1 = mathproduct();
 c = new CssCalc(ac, v1);
                           nb_pre_sp = 0;
-    label_190:
+    label_196:
     while (true) {
-      if (jj_2_27(2)) {
+      if (jj_2_25(2)) {
         ;
       } else {
-        break label_190;
+        break label_196;
       }
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case PLUS:{
@@ -7545,7 +7817,7 @@ final public boolean prio() throws ParseException {
         }
       case S:
       case MINUS:{
-        label_191:
+        label_197:
         while (true) {
           switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
           case S:{
@@ -7553,8 +7825,8 @@ final public boolean prio() throws ParseException {
             break;
             }
           default:
-            jj_la1[280] = jj_gen;
-            break label_191;
+            jj_la1[294] = jj_gen;
+            break label_197;
           }
           jj_consume_token(S);
 nb_pre_sp++;
@@ -7563,14 +7835,14 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[281] = jj_gen;
+        jj_la1[295] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
 if (o.image.length() < 2 && nb_pre_sp == 0) {
                 {if (true) throw new ParseException(ac.getMsg().getString("parser.calcwhitespace"));}
             }
-      label_192:
+      label_198:
       while (true) {
         jj_consume_token(S);
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -7579,8 +7851,8 @@ final public boolean prio() throws ParseException {
           break;
           }
         default:
-          jj_la1[282] = jj_gen;
-          break label_192;
+          jj_la1[296] = jj_gen;
+          break label_198;
         }
       }
       v2 = mathproduct();
@@ -7610,14 +7882,14 @@ final public boolean prio() throws ParseException {
   boolean concat = false;
     v1 = mathunit();
 c = new CssCalc(ac, v1);
-    label_193:
+    label_199:
     while (true) {
-      if (jj_2_28(2)) {
+      if (jj_2_26(2)) {
         ;
       } else {
-        break label_193;
+        break label_199;
       }
-      label_194:
+      label_200:
       while (true) {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
         case S:{
@@ -7625,15 +7897,15 @@ final public boolean prio() throws ParseException {
           break;
           }
         default:
-          jj_la1[283] = jj_gen;
-          break label_194;
+          jj_la1[297] = jj_gen;
+          break label_200;
         }
         jj_consume_token(S);
       }
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case ANY:{
         o = jj_consume_token(ANY);
-        label_195:
+        label_201:
         while (true) {
           switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
           case S:{
@@ -7641,8 +7913,8 @@ final public boolean prio() throws ParseException {
             break;
             }
           default:
-            jj_la1[284] = jj_gen;
-            break label_195;
+            jj_la1[298] = jj_gen;
+            break label_201;
           }
           jj_consume_token(S);
         }
@@ -7651,7 +7923,7 @@ final public boolean prio() throws ParseException {
         }
       case DIV:{
         o = jj_consume_token(DIV);
-        label_196:
+        label_202:
         while (true) {
           switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
           case S:{
@@ -7659,14 +7931,15 @@ final public boolean prio() throws ParseException {
             break;
             }
           default:
-            jj_la1[285] = jj_gen;
-            break label_196;
+            jj_la1[299] = jj_gen;
+            break label_202;
           }
           jj_consume_token(S);
         }
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
         case PLUS:
         case MINUS:
+        case IDENT:
         case LPAREN:
         case NUMBER:{
           v2 = calcnumbervalue();
@@ -7680,14 +7953,14 @@ final public boolean prio() throws ParseException {
           break;
           }
         default:
-          jj_la1[286] = jj_gen;
+          jj_la1[300] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
         break;
         }
       default:
-        jj_la1[287] = jj_gen;
+        jj_la1[301] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -7713,6 +7986,7 @@ final public boolean prio() throws ParseException {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case PLUS:
     case MINUS:
+    case IDENT:
     case NUMBER:{
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case PLUS:
@@ -7721,16 +7995,29 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[288] = jj_gen;
+        jj_la1[302] = jj_gen;
         ;
       }
-      n = jj_consume_token(NUMBER);
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case NUMBER:{
+        n = jj_consume_token(NUMBER);
+        break;
+        }
+      case IDENT:{
+        n = jj_consume_token(IDENT);
+        break;
+        }
+      default:
+        jj_la1[303] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
 v = new CssNumber(); v.set(addOperator(operator, n.image), ac);
       break;
       }
     case LPAREN:{
       jj_consume_token(LPAREN);
-      label_197:
+      label_203:
       while (true) {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
         case S:{
@@ -7738,13 +8025,13 @@ final public boolean prio() throws ParseException {
           break;
           }
         default:
-          jj_la1[289] = jj_gen;
-          break label_197;
+          jj_la1[304] = jj_gen;
+          break label_203;
         }
         jj_consume_token(S);
       }
       v = calcnumbersum();
-      label_198:
+      label_204:
       while (true) {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
         case S:{
@@ -7752,8 +8039,8 @@ final public boolean prio() throws ParseException {
           break;
           }
         default:
-          jj_la1[290] = jj_gen;
-          break label_198;
+          jj_la1[305] = jj_gen;
+          break label_204;
         }
         jj_consume_token(S);
       }
@@ -7762,7 +8049,7 @@ final public boolean prio() throws ParseException {
       break;
       }
     default:
-      jj_la1[291] = jj_gen;
+      jj_la1[306] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -7779,12 +8066,12 @@ final public boolean prio() throws ParseException {
   int nb_pre_sp;
     v1 = calcnumberproduct();
 c = new CssCalc(ac, v1); nb_pre_sp = 0;
-    label_199:
+    label_205:
     while (true) {
-      if (jj_2_29(2)) {
+      if (jj_2_27(2)) {
         ;
       } else {
-        break label_199;
+        break label_205;
       }
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case PLUS:{
@@ -7793,7 +8080,7 @@ final public boolean prio() throws ParseException {
         }
       case S:
       case MINUS:{
-        label_200:
+        label_206:
         while (true) {
           switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
           case S:{
@@ -7801,8 +8088,8 @@ final public boolean prio() throws ParseException {
             break;
             }
           default:
-            jj_la1[292] = jj_gen;
-            break label_200;
+            jj_la1[307] = jj_gen;
+            break label_206;
           }
           jj_consume_token(S);
 nb_pre_sp++;
@@ -7811,14 +8098,14 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[293] = jj_gen;
+        jj_la1[308] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
 if (o.image.length() < 2 && nb_pre_sp == 0) {
                 {if (true) throw new ParseException(ac.getMsg().getString("parser.calcwhitespace"));}
             }
-      label_201:
+      label_207:
       while (true) {
         jj_consume_token(S);
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -7827,8 +8114,8 @@ final public boolean prio() throws ParseException {
           break;
           }
         default:
-          jj_la1[294] = jj_gen;
-          break label_201;
+          jj_la1[309] = jj_gen;
+          break label_207;
         }
       }
       v2 = calcnumberproduct();
@@ -7854,14 +8141,14 @@ final public boolean prio() throws ParseException {
   boolean concat = false;
     v1 = calcnumbervalue();
 c = new CssCalc(ac, v1);
-    label_202:
+    label_208:
     while (true) {
-      if (jj_2_30(2)) {
+      if (jj_2_28(2)) {
         ;
       } else {
-        break label_202;
+        break label_208;
       }
-      label_203:
+      label_209:
       while (true) {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
         case S:{
@@ -7869,8 +8156,8 @@ final public boolean prio() throws ParseException {
           break;
           }
         default:
-          jj_la1[295] = jj_gen;
-          break label_203;
+          jj_la1[310] = jj_gen;
+          break label_209;
         }
         jj_consume_token(S);
       }
@@ -7884,11 +8171,11 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[296] = jj_gen;
+        jj_la1[311] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
-      label_204:
+      label_210:
       while (true) {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
         case S:{
@@ -7896,8 +8183,8 @@ final public boolean prio() throws ParseException {
           break;
           }
         default:
-          jj_la1[297] = jj_gen;
-          break label_204;
+          jj_la1[312] = jj_gen;
+          break label_210;
         }
         jj_consume_token(S);
       }
@@ -7921,6 +8208,7 @@ final public boolean prio() throws ParseException {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case PLUS:
     case MINUS:
+    case IDENT:
     case RELFONTLENGTH:
     case RELVIEWLENGTH:
     case ABSOLUTLENGTH:
@@ -7937,12 +8225,26 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[298] = jj_gen;
+        jj_la1[313] = jj_gen;
         ;
       }
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case IDENT:
       case NUMBER:{
-        n = jj_consume_token(NUMBER);
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case NUMBER:{
+          n = jj_consume_token(NUMBER);
+          break;
+          }
+        case IDENT:{
+          n = jj_consume_token(IDENT);
+          break;
+          }
+        default:
+          jj_la1[314] = jj_gen;
+          jj_consume_token(-1);
+          throw new ParseException();
+        }
 v = new CssNumber(); v.set(addOperator(operator, n.image), ac);
         break;
         }
@@ -7987,7 +8289,7 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[299] = jj_gen;
+        jj_la1[315] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -7995,7 +8297,7 @@ final public boolean prio() throws ParseException {
       }
     case LPAREN:{
       jj_consume_token(LPAREN);
-      label_205:
+      label_211:
       while (true) {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
         case S:{
@@ -8003,13 +8305,13 @@ final public boolean prio() throws ParseException {
           break;
           }
         default:
-          jj_la1[300] = jj_gen;
-          break label_205;
+          jj_la1[316] = jj_gen;
+          break label_211;
         }
         jj_consume_token(S);
       }
       v = mathsum();
-      label_206:
+      label_212:
       while (true) {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
         case S:{
@@ -8017,8 +8319,8 @@ final public boolean prio() throws ParseException {
           break;
           }
         default:
-          jj_la1[301] = jj_gen;
-          break label_206;
+          jj_la1[317] = jj_gen;
+          break label_212;
         }
         jj_consume_token(S);
       }
@@ -8030,12 +8332,11 @@ final public boolean prio() throws ParseException {
       v = mathcalc();
       break;
       }
-    case FUNCTIONMAX:{
-      v = mathmax();
-      break;
-      }
-    case FUNCTIONMIN:{
-      v = mathmin();
+    case FUNCTIONMATHN:
+    case FUNCTIONMATH1:
+    case FUNCTIONMATH2:
+    case FUNCTIONROUND:{
+      v = mathfunction();
       break;
       }
     case FUNCTIONCLAMP:{
@@ -8051,7 +8352,7 @@ final public boolean prio() throws ParseException {
       break;
       }
     default:
-      jj_la1[302] = jj_gen;
+      jj_la1[318] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -8063,7 +8364,7 @@ final public boolean prio() throws ParseException {
 Token n = null;
 CssExpression exp = null;
     jj_consume_token(FUNCTIONATTR);
-    label_207:
+    label_213:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case S:{
@@ -8071,13 +8372,13 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[303] = jj_gen;
-        break label_207;
+        jj_la1[319] = jj_gen;
+        break label_213;
       }
       jj_consume_token(S);
     }
     n = ident();
-    label_208:
+    label_214:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case S:{
@@ -8085,8 +8386,8 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[304] = jj_gen;
-        break label_208;
+        jj_la1[320] = jj_gen;
+        break label_214;
       }
       jj_consume_token(S);
     }
@@ -8098,7 +8399,7 @@ final public boolean prio() throws ParseException {
     case ONLY:
     case NOT:
     case IDENT:
-    case 147:{
+    case 148:{
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case AND:
       case OR:
@@ -8108,17 +8409,17 @@ final public boolean prio() throws ParseException {
         n = ident();
         break;
         }
-      case 147:{
-        n = jj_consume_token(147);
+      case 148:{
+        n = jj_consume_token(148);
         break;
         }
       default:
-        jj_la1[305] = jj_gen;
+        jj_la1[321] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
 setValue(new CssIdent(), exp, ' ', n, IDENT);
-      label_209:
+      label_215:
       while (true) {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
         case S:{
@@ -8126,22 +8427,22 @@ final public boolean prio() throws ParseException {
           break;
           }
         default:
-          jj_la1[306] = jj_gen;
-          break label_209;
+          jj_la1[322] = jj_gen;
+          break label_215;
         }
         jj_consume_token(S);
       }
       break;
       }
     default:
-      jj_la1[307] = jj_gen;
+      jj_la1[323] = jj_gen;
       ;
     }
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case COMMA:{
       jj_consume_token(COMMA);
 exp.setOperator(',');
-      label_210:
+      label_216:
       while (true) {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
         case S:{
@@ -8149,8 +8450,8 @@ final public boolean prio() throws ParseException {
           break;
           }
         default:
-          jj_la1[308] = jj_gen;
-          break label_210;
+          jj_la1[324] = jj_gen;
+          break label_216;
         }
         jj_consume_token(S);
       }
@@ -8158,7 +8459,7 @@ final public boolean prio() throws ParseException {
       break;
       }
     default:
-      jj_la1[309] = jj_gen;
+      jj_la1[325] = jj_gen;
       ;
     }
     jj_consume_token(RPAREN);
@@ -8173,7 +8474,7 @@ final public boolean prio() throws ParseException {
  CssExpression e;
  CssVariable var;
     jj_consume_token(FUNCTIONVAR);
-    label_211:
+    label_217:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case S:{
@@ -8181,14 +8482,14 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[310] = jj_gen;
-        break label_211;
+        jj_la1[326] = jj_gen;
+        break label_217;
       }
       jj_consume_token(S);
     }
     n = jj_consume_token(CUSTOM_PROPERTY_NAME);
 var = new CssVariable(ac, convertIdent(n.image));
-    label_212:
+    label_218:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case COMMA:{
@@ -8196,11 +8497,11 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[311] = jj_gen;
-        break label_212;
+        jj_la1[327] = jj_gen;
+        break label_218;
       }
       jj_consume_token(COMMA);
-      label_213:
+      label_219:
       while (true) {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
         case S:{
@@ -8208,8 +8509,8 @@ final public boolean prio() throws ParseException {
           break;
           }
         default:
-          jj_la1[312] = jj_gen;
-          break label_213;
+          jj_la1[328] = jj_gen;
+          break label_219;
         }
         jj_consume_token(S);
       }
@@ -8233,7 +8534,7 @@ final public boolean prio() throws ParseException {
                              }
                          }
     }
-    label_214:
+    label_220:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case S:{
@@ -8241,8 +8542,8 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[313] = jj_gen;
-        break label_214;
+        jj_la1[329] = jj_gen;
+        break label_220;
       }
       jj_consume_token(S);
     }
@@ -8258,10 +8559,10 @@ final public boolean prio() throws ParseException {
  * @exception ParseException exception during the parse
  */
   final public CssValue function() throws ParseException {Token n,p = null,q = null;
- CssExpression exp;
+ CssExpression exp = new CssExpression();
  CssColor color = new CssColor();
     n = jj_consume_token(FUNCTION);
-    label_215:
+    label_221:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case S:{
@@ -8269,24 +8570,71 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[314] = jj_gen;
-        break label_215;
+        jj_la1[330] = jj_gen;
+        break label_221;
       }
       jj_consume_token(S);
     }
-    if (jj_2_31(2)) {
-      exp = expr();
-      jj_consume_token(RPAREN);
-String funcname = n.image.toLowerCase();
-        if (funcname.equals("rgb(")) {
-            color.setRGBColor(ac, exp);
-            {if ("" != null) return color;}
-        } else if (funcname.equals("rgba(")) {
-            color.setRGBAColor(ac, exp);
-            {if ("" != null) return color;}
-        } else if (funcname.equals("hsl(")) {
-            color.setHSLColor(ac, exp);
-            {if ("" != null) return color;}
+    if (jj_2_29(2)) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case PLUS:
+      case MINUS:
+      case AND:
+      case OR:
+      case ONLY:
+      case NOT:
+      case STRING:
+      case IDENT:
+      case HASHIDENT:
+      case HASH:
+      case PROGID:
+      case DIV:
+      case LBRACKET:
+      case RBRACKET:
+      case URL:
+      case RELFONTLENGTH:
+      case RELVIEWLENGTH:
+      case ABSOLUTLENGTH:
+      case FLEX:
+      case ANGLE:
+      case SPL:
+      case ST:
+      case TIME:
+      case FREQ:
+      case RESOLUTION:
+      case DIMEN_9:
+      case DIMEN:
+      case PERCENTAGE:
+      case NUMBER:
+      case IMPORTANT_NOT:
+      case UNICODERANGE:
+      case FUNCTIONCALC:
+      case FUNCTIONMATHN:
+      case FUNCTIONMATH1:
+      case FUNCTIONMATH2:
+      case FUNCTIONROUND:
+      case FUNCTIONCLAMP:
+      case FUNCTIONATTR:
+      case FUNCTIONVAR:
+      case FUNCTION:{
+        exp = expr();
+        break;
+        }
+      default:
+        jj_la1[331] = jj_gen;
+        ;
+      }
+      jj_consume_token(RPAREN);
+String funcname = n.image.toLowerCase();
+        if (funcname.equals("rgb(")) {
+            color.setRGBColor(ac, exp);
+            {if ("" != null) return color;}
+        } else if (funcname.equals("rgba(")) {
+            color.setRGBAColor(ac, exp);
+            {if ("" != null) return color;}
+        } else if (funcname.equals("hsl(")) {
+            color.setHSLColor(ac, exp);
+            {if ("" != null) return color;}
         } else if (funcname.equals("hsla(")) {
             color.setHSLColor(ac, exp);
             {if ("" != null) return color;}
@@ -8302,6 +8650,14 @@ final public boolean prio() throws ParseException {
         } else if (funcname.equals("device-cmyk(")) {
             color.setDeviceCMYKColor(ac, exp);
             {if ("" != null) return color;}
+        } else if (funcname.equals("light-dark(")) {
+            color.setLightDark(ac, exp);
+            {if ("" != null) return color;}
+/*
+        } else if (funcname.equals("color-mix(")) {
+	    color.setColorMix(ac, exp);
+	    return color;
+*/
         } else if (funcname.equals("image(")) {
             CssImage img = new CssImage();
             img.setImageList(exp, ac);
@@ -8361,7 +8717,7 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[315] = jj_gen;
+        jj_la1[332] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -8393,7 +8749,7 @@ final public boolean prio() throws ParseException {
       break;
       }
     default:
-      jj_la1[316] = jj_gen;
+      jj_la1[333] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -8522,9 +8878,11 @@ final public boolean prio() throws ParseException {
             case FUNCTIONNTHLASTOFTYPE:
             case FUNCTIONNOT:
             case FUNCTIONCALC:
-            case FUNCTIONMIN:
-            case FUNCTIONMAX:
+            case FUNCTIONMATHN:
+            case FUNCTIONMATH1:
+            case FUNCTIONMATH2:
             case FUNCTIONCLAMP:
+            case FUNCTIONROUND:
             case FUNCTIONATTR:
             case FUNCTIONVAR:
                 s.append(tok.image);
@@ -8856,160 +9214,131 @@ private boolean jj_2_29(int xla)
     finally { jj_save(28, xla); }
   }
 
-  private boolean jj_2_30(int xla)
- {
-    jj_la = xla; jj_lastpos = jj_scanpos = token;
-    try { return !jj_3_30(); }
-    catch(LookaheadSuccess ls) { return true; }
-    finally { jj_save(29, xla); }
-  }
-
-  private boolean jj_2_31(int xla)
- {
-    jj_la = xla; jj_lastpos = jj_scanpos = token;
-    try { return !jj_3_31(); }
-    catch(LookaheadSuccess ls) { return true; }
-    finally { jj_save(30, xla); }
-  }
-
-  private boolean jj_3R_254()
- {
-    if (jj_3R_227()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_253()
+  private boolean jj_3R_452()
  {
-    if (jj_3R_283()) return true;
+    if (jj_3R_238()) return true;
     return false;
   }
 
-  private boolean jj_3R_252()
+  private boolean jj_3R_300()
  {
-    if (jj_3R_282()) return true;
+    if (jj_3R_232()) return true;
     return false;
   }
 
-  private boolean jj_3R_241()
+  private boolean jj_3R_451()
  {
-    if (jj_3R_233()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3_22()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_scan_token(STRING)) return true;
     return false;
   }
 
-  private boolean jj_3R_251()
+  private boolean jj_3R_299()
  {
-    if (jj_3R_281()) return true;
+    if (jj_3R_370()) return true;
     return false;
   }
 
-  private boolean jj_3R_225()
+  private boolean jj_3R_450()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_251()) {
-    jj_scanpos = xsp;
-    if (jj_3R_252()) {
-    jj_scanpos = xsp;
-    if (jj_3R_253()) {
-    jj_scanpos = xsp;
-    if (jj_3R_254()) return true;
-    }
-    }
-    }
+    if (jj_scan_token(DIMEN)) return true;
     return false;
   }
 
-  private boolean jj_3R_432()
+  private boolean jj_3R_298()
  {
-    if (jj_3R_231()) return true;
+    if (jj_3R_369()) return true;
     return false;
   }
 
-  private boolean jj_3R_431()
+  private boolean jj_3R_297()
  {
-    if (jj_scan_token(STRING)) return true;
+    if (jj_3R_368()) return true;
     return false;
   }
 
-  private boolean jj_3R_430()
+  private boolean jj_3R_449()
  {
-    if (jj_scan_token(DIMEN)) return true;
+    if (jj_scan_token(PERCENTAGE)) return true;
     return false;
   }
 
-  private boolean jj_3R_429()
+  private boolean jj_3R_448()
  {
-    if (jj_scan_token(PERCENTAGE)) return true;
+    if (jj_scan_token(NUMBER)) return true;
     return false;
   }
 
-  private boolean jj_3R_428()
+  private boolean jj_3R_263()
  {
-    if (jj_scan_token(NUMBER)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_297()) {
+    jj_scanpos = xsp;
+    if (jj_3R_298()) {
+    jj_scanpos = xsp;
+    if (jj_3R_299()) {
+    jj_scanpos = xsp;
+    if (jj_3R_300()) return true;
+    }
+    }
+    }
     return false;
   }
 
-  private boolean jj_3R_427()
+  private boolean jj_3R_447()
  {
     if (jj_scan_token(MINUS)) return true;
     return false;
   }
 
-  private boolean jj_3R_426()
+  private boolean jj_3R_446()
  {
     if (jj_scan_token(PLUS)) return true;
     return false;
   }
 
-  private boolean jj_3R_420()
+  private boolean jj_3R_441()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_426()) {
+    if (jj_3R_446()) {
     jj_scanpos = xsp;
-    if (jj_3R_427()) {
+    if (jj_3R_447()) {
     jj_scanpos = xsp;
-    if (jj_3R_428()) {
+    if (jj_3R_448()) {
     jj_scanpos = xsp;
-    if (jj_3R_429()) {
+    if (jj_3R_449()) {
     jj_scanpos = xsp;
-    if (jj_3R_430()) {
+    if (jj_3R_450()) {
     jj_scanpos = xsp;
-    if (jj_3R_431()) {
+    if (jj_3R_451()) {
     jj_scanpos = xsp;
-    if (jj_3R_432()) return true;
+    if (jj_3R_452()) return true;
     }
     }
     }
     }
     }
     }
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
-  private boolean jj_3R_415()
+  private boolean jj_3R_431()
  {
     Token xsp;
-    if (jj_3R_420()) return true;
+    if (jj_3R_441()) return true;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_420()) { jj_scanpos = xsp; break; }
+      if (jj_3R_441()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  private boolean jj_3R_418()
- {
-    if (jj_3R_248()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_373()
+  private boolean jj_3R_376()
  {
     Token xsp;
     xsp = jj_scanpos;
@@ -9020,41 +9349,52 @@ private boolean jj_3R_373()
     return false;
   }
 
-  private boolean jj_3R_392()
+  private boolean jj_3R_405()
  {
-    if (jj_3R_399()) return true;
-    if (jj_scan_token(COLON)) return true;
+    if (jj_3R_238()) return true;
+    if (jj_scan_token(EQ)) return true;
+    if (jj_scan_token(NUMBER)) return true;
     return false;
   }
 
-  private boolean jj_3R_396()
+  private boolean jj_3R_443()
  {
-    if (jj_3R_231()) return true;
-    if (jj_scan_token(EQ)) return true;
-    if (jj_scan_token(NUMBER)) return true;
+    if (jj_3R_255()) return true;
     return false;
   }
 
-  private boolean jj_3_31()
+  private boolean jj_3R_437()
  {
-    if (jj_3R_241()) return true;
-    if (jj_scan_token(RPAREN)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_443()) jj_scanpos = xsp;
+    if (jj_3R_435()) return true;
     return false;
   }
 
-  private boolean jj_3R_412()
+  private boolean jj_3R_248()
  {
-    if (true) { jj_la = 0; jj_scanpos = jj_lastpos; return false;}
+    if (jj_3R_279()) return true;
     return false;
   }
 
-  private boolean jj_3R_364()
+  private boolean jj_3R_394()
  {
-    if (jj_scan_token(HASH)) return true;
+    if (jj_3R_408()) return true;
+    if (jj_scan_token(COLON)) return true;
     return false;
   }
 
-  private boolean jj_3R_372()
+  private boolean jj_3_29()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_248()) jj_scanpos = xsp;
+    if (jj_scan_token(RPAREN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_375()
  {
     if (jj_scan_token(FUNCTION)) return true;
     Token xsp;
@@ -9063,38 +9403,38 @@ private boolean jj_3R_372()
       if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
     }
     xsp = jj_scanpos;
-    if (jj_3_31()) {
+    if (jj_3_29()) {
     jj_scanpos = xsp;
-    if (jj_3R_396()) return true;
+    if (jj_3R_405()) return true;
     }
     return false;
   }
 
-  private boolean jj_3R_357()
+  private boolean jj_3R_428()
  {
-    if (jj_3R_391()) return true;
+    if (true) { jj_la = 0; jj_scanpos = jj_lastpos; return false;}
     return false;
   }
 
-  private boolean jj_3R_414()
+  private boolean jj_3R_396()
  {
-    if (true) { jj_la = 0; jj_scanpos = jj_lastpos; return false;}
+    if (jj_scan_token(HASH)) return true;
     return false;
   }
 
-  private boolean jj_3R_435()
+  private boolean jj_3R_458()
  {
     if (jj_scan_token(COMMA)) return true;
     return false;
   }
 
-  private boolean jj_3R_436()
+  private boolean jj_3R_459()
  {
     if (jj_scan_token(COMMA)) return true;
     return false;
   }
 
-  private boolean jj_3R_355()
+  private boolean jj_3R_360()
  {
     if (jj_scan_token(FUNCTIONVAR)) return true;
     Token xsp;
@@ -9105,7 +9445,7 @@ private boolean jj_3R_355()
     if (jj_scan_token(CUSTOM_PROPERTY_NAME)) return true;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_436()) { jj_scanpos = xsp; break; }
+      if (jj_3R_459()) { jj_scanpos = xsp; break; }
     }
     while (true) {
       xsp = jj_scanpos;
@@ -9115,363 +9455,492 @@ private boolean jj_3R_355()
     return false;
   }
 
-  private boolean jj_3R_281()
- {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_363()) {
-    jj_scanpos = xsp;
-    if (jj_3R_364()) return true;
-    }
-    return false;
-  }
-
-  private boolean jj_3R_363()
- {
-    if (jj_scan_token(HASHIDENT)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_437()
- {
-    if (jj_3R_231()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_358()
+  private boolean jj_3R_460()
  {
-    if (jj_3R_392()) return true;
+    if (jj_3R_238()) return true;
     return false;
   }
 
-  private boolean jj_3R_434()
+  private boolean jj_3R_457()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_437()) {
+    if (jj_3R_460()) {
     jj_scanpos = xsp;
-    if (jj_scan_token(147)) return true;
+    if (jj_scan_token(148)) return true;
     }
     return false;
   }
 
-  private boolean jj_3_4()
+  private boolean jj_3R_384()
  {
-    if (jj_3R_218()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(75)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(41)) return true;
+    }
     return false;
   }
 
-  private boolean jj_3R_291()
+  private boolean jj_3R_374()
  {
-    if (jj_scan_token(FUNCTION)) return true;
+    if (jj_scan_token(FUNCTIONATTR)) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
       if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
     }
-    if (jj_3R_415()) return true;
+    if (jj_3R_238()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
+    }
+    xsp = jj_scanpos;
+    if (jj_3R_457()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_458()) jj_scanpos = xsp;
+    if (jj_scan_token(RPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_382()
+  private boolean jj_3R_362()
  {
-    if (jj_scan_token(NUMBER)) return true;
+    if (jj_3R_393()) return true;
     return false;
   }
 
-  private boolean jj_3R_276()
+  private boolean jj_3R_359()
  {
-    if (jj_scan_token(LPAREN)) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
-    }
-    xsp = jj_scanpos;
-    if (jj_3_4()) {
-    jj_scanpos = xsp;
-    if (jj_3R_358()) return true;
-    }
+    if (jj_3R_360()) return true;
     return false;
   }
 
-  private boolean jj_3R_413()
+  private boolean jj_3R_358()
  {
-    if (jj_3R_419()) return true;
+    if (jj_3R_374()) return true;
     return false;
   }
 
-  private boolean jj_3R_371()
+  private boolean jj_3R_357()
  {
-    if (jj_scan_token(FUNCTIONATTR)) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
-    }
-    if (jj_3R_231()) return true;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
-    }
-    xsp = jj_scanpos;
-    if (jj_3R_434()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_435()) jj_scanpos = xsp;
-    if (jj_scan_token(RPAREN)) return true;
+    if (jj_3R_373()) return true;
     return false;
   }
 
-  private boolean jj_3_3()
+  private boolean jj_3R_356()
  {
-    if (jj_3R_217()) return true;
+    if (jj_3R_372()) return true;
     return false;
   }
 
-  private boolean jj_3R_290()
+  private boolean jj_3R_430()
  {
+    if (true) { jj_la = 0; jj_scanpos = jj_lastpos; return false;}
+    return false;
+  }
+
+  private boolean jj_3R_355()
+ {
+    if (jj_3R_371()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_354()
+ {
+    if (jj_scan_token(LPAREN)) return true;
     Token xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(131)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(132)) return true;
-    }
     while (true) {
       xsp = jj_scanpos;
       if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
     }
-    xsp = jj_scanpos;
-    if (jj_3R_413()) {
-    jj_scanpos = xsp;
-    if (jj_3R_414()) return true;
+    if (jj_3R_400()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
     }
+    if (jj_scan_token(RPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_220()
+  private boolean jj_3R_392()
  {
-    if (jj_3R_247()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
-    }
+    if (jj_scan_token(FREQ)) return true;
     return false;
   }
 
-  private boolean jj_3R_354()
+  private boolean jj_3R_391()
  {
-    if (jj_3R_355()) return true;
+    if (jj_scan_token(TIME)) return true;
     return false;
   }
 
-  private boolean jj_3R_410()
+  private boolean jj_3R_390()
  {
-    if (jj_3R_418()) return true;
+    if (jj_scan_token(ANGLE)) return true;
     return false;
   }
 
-  private boolean jj_3R_411()
+  private boolean jj_3R_389()
  {
-    if (jj_3R_419()) return true;
+    if (jj_scan_token(FLEX)) return true;
     return false;
   }
 
-  private boolean jj_3R_353()
+  private boolean jj_3R_388()
  {
-    if (jj_3R_371()) return true;
+    if (jj_scan_token(ABSOLUTLENGTH)) return true;
     return false;
   }
 
-  private boolean jj_3R_352()
+  private boolean jj_3R_387()
  {
-    if (jj_3R_370()) return true;
+    if (jj_scan_token(RELVIEWLENGTH)) return true;
     return false;
   }
 
-  private boolean jj_3R_351()
+  private boolean jj_3R_383()
  {
-    if (jj_3R_369()) return true;
+    if (jj_3R_254()) return true;
     return false;
   }
 
-  private boolean jj_3R_350()
+  private boolean jj_3R_386()
  {
-    if (jj_3R_368()) return true;
+    if (jj_scan_token(RELFONTLENGTH)) return true;
     return false;
   }
 
-  private boolean jj_3R_349()
+  private boolean jj_3R_385()
  {
-    if (jj_3R_367()) return true;
+    if (jj_scan_token(PERCENTAGE)) return true;
     return false;
   }
 
-  private boolean jj_3R_289()
+  private boolean jj_3R_353()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(129)) {
+    if (jj_3R_383()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_384()) {
     jj_scanpos = xsp;
-    if (jj_scan_token(130)) {
+    if (jj_3R_385()) {
     jj_scanpos = xsp;
-    if (jj_scan_token(133)) {
+    if (jj_3R_386()) {
     jj_scanpos = xsp;
-    if (jj_scan_token(134)) return true;
+    if (jj_3R_387()) {
+    jj_scanpos = xsp;
+    if (jj_3R_388()) {
+    jj_scanpos = xsp;
+    if (jj_3R_389()) {
+    jj_scanpos = xsp;
+    if (jj_3R_390()) {
+    jj_scanpos = xsp;
+    if (jj_3R_391()) {
+    jj_scanpos = xsp;
+    if (jj_3R_392()) return true;
+    }
+    }
     }
     }
     }
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
     }
+    }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_273()
+ {
+    Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_411()) {
+    if (jj_3R_353()) {
+    jj_scanpos = xsp;
+    if (jj_3R_354()) {
+    jj_scanpos = xsp;
+    if (jj_3R_355()) {
+    jj_scanpos = xsp;
+    if (jj_3R_356()) {
+    jj_scanpos = xsp;
+    if (jj_3R_357()) {
     jj_scanpos = xsp;
-    if (jj_3R_412()) return true;
+    if (jj_3R_358()) {
+    jj_scanpos = xsp;
+    if (jj_3R_359()) return true;
+    }
+    }
+    }
+    }
+    }
     }
     return false;
   }
 
-  private boolean jj_3R_348()
+  private boolean jj_3R_368()
  {
-    if (jj_scan_token(LPAREN)) return true;
     Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
+    xsp = jj_scanpos;
+    if (jj_3R_395()) {
+    jj_scanpos = xsp;
+    if (jj_3R_396()) return true;
     }
-    if (jj_3R_395()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_395()
+ {
+    if (jj_scan_token(HASHIDENT)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_440()
+ {
+    if (jj_3R_238()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_294()
+ {
+    if (jj_scan_token(FUNCTION)) return true;
+    Token xsp;
     while (true) {
       xsp = jj_scanpos;
       if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
     }
-    if (jj_scan_token(RPAREN)) return true;
+    if (jj_3R_431()) return true;
     return false;
   }
 
-  private boolean jj_3R_390()
+  private boolean jj_3R_363()
  {
-    if (jj_scan_token(FREQ)) return true;
+    if (jj_3R_394()) return true;
     return false;
   }
 
-  private boolean jj_3R_389()
+  private boolean jj_3R_276()
  {
-    if (jj_scan_token(TIME)) return true;
+    if (jj_scan_token(S)) return true;
     return false;
   }
 
-  private boolean jj_3R_388()
+  private boolean jj_3_4()
  {
-    if (jj_scan_token(ANGLE)) return true;
+    if (jj_3R_224()) return true;
     return false;
   }
 
-  private boolean jj_3R_387()
+  private boolean jj_3R_429()
  {
-    if (jj_scan_token(FLEX)) return true;
+    if (jj_3R_439()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
-  private boolean jj_3R_386()
+  private boolean jj_3R_246()
  {
-    if (jj_scan_token(ABSOLUTLENGTH)) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_276()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_scan_token(MINUS)) return true;
     return false;
   }
 
-  private boolean jj_3R_385()
+  private boolean jj_3R_282()
  {
-    if (jj_scan_token(RELVIEWLENGTH)) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
+    }
+    xsp = jj_scanpos;
+    if (jj_3_4()) {
+    jj_scanpos = xsp;
+    if (jj_3R_363()) return true;
+    }
     return false;
   }
 
-  private boolean jj_3R_246()
+  private boolean jj_3_28()
  {
-    if (jj_3R_276()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
+    }
+    xsp = jj_scanpos;
+    if (jj_scan_token(52)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(55)) return true;
+    }
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
+    }
+    if (jj_3R_247()) return true;
     return false;
   }
 
-  private boolean jj_3R_381()
+  private boolean jj_3R_293()
  {
-    if (jj_3R_247()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(130)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(131)) return true;
+    }
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
+    }
+    xsp = jj_scanpos;
+    if (jj_3R_429()) {
+    jj_scanpos = xsp;
+    if (jj_3R_430()) return true;
+    }
     return false;
   }
 
-  private boolean jj_3R_384()
+  private boolean jj_3R_438()
  {
-    if (jj_scan_token(RELFONTLENGTH)) return true;
+    if (jj_scan_token(COMMA)) return true;
     return false;
   }
 
-  private boolean jj_3R_383()
+  private boolean jj_3_3()
  {
-    if (jj_scan_token(PERCENTAGE)) return true;
+    if (jj_3R_223()) return true;
     return false;
   }
 
-  private boolean jj_3R_347()
+  private boolean jj_3R_427()
  {
+    if (jj_3R_439()) return true;
     Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
+    }
     xsp = jj_scanpos;
-    if (jj_3R_381()) jj_scanpos = xsp;
+    if (jj_3R_440()) jj_scanpos = xsp;
+    return false;
+  }
+
+  private boolean jj_3R_226()
+ {
+    if (jj_3R_254()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_426()
+ {
+    if (jj_3R_437()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_438()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_292()
+ {
+    Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_382()) {
-    jj_scanpos = xsp;
-    if (jj_3R_383()) {
-    jj_scanpos = xsp;
-    if (jj_3R_384()) {
-    jj_scanpos = xsp;
-    if (jj_3R_385()) {
-    jj_scanpos = xsp;
-    if (jj_3R_386()) {
+    if (jj_scan_token(128)) {
     jj_scanpos = xsp;
-    if (jj_3R_387()) {
-    jj_scanpos = xsp;
-    if (jj_3R_388()) {
+    if (jj_scan_token(129)) {
     jj_scanpos = xsp;
-    if (jj_3R_389()) {
+    if (jj_scan_token(132)) {
     jj_scanpos = xsp;
-    if (jj_3R_390()) return true;
-    }
+    if (jj_scan_token(133)) return true;
     }
     }
     }
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
     }
+    xsp = jj_scanpos;
+    if (jj_3R_427()) {
+    jj_scanpos = xsp;
+    if (jj_3R_428()) return true;
     }
+    return false;
+  }
+
+  private boolean jj_3_27()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(28)) {
+    jj_scanpos = xsp;
+    if (jj_3R_246()) return true;
     }
+    if (jj_scan_token(21)) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  private boolean jj_3R_288()
+  private boolean jj_3R_291()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(127)) {
+    if (jj_scan_token(126)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(128)) return true;
+    if (jj_scan_token(127)) return true;
     }
     while (true) {
       xsp = jj_scanpos;
       if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
     }
-    if (jj_3R_224()) return true;
+    if (jj_3R_230()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_253()
+ {
+    if (jj_3R_282()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_436()
+ {
+    if (jj_scan_token(COMMA)) return true;
     return false;
   }
 
-  private boolean jj_3R_218()
+  private boolean jj_3R_224()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_245()) {
+    if (jj_3R_252()) {
     jj_scanpos = xsp;
-    if (jj_3R_246()) return true;
+    if (jj_3R_253()) return true;
     }
     return false;
   }
 
-  private boolean jj_3R_245()
+  private boolean jj_3R_252()
  {
     if (jj_scan_token(NOT)) return true;
     Token xsp;
@@ -9480,42 +9949,30 @@ private boolean jj_3R_245()
       xsp = jj_scanpos;
       if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
     }
-    if (jj_3R_276()) return true;
+    if (jj_3R_282()) return true;
     return false;
   }
 
-  private boolean jj_3R_268()
+  private boolean jj_3R_425()
  {
+    if (jj_3R_435()) return true;
     Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_347()) {
-    jj_scanpos = xsp;
-    if (jj_3R_348()) {
-    jj_scanpos = xsp;
-    if (jj_3R_349()) {
-    jj_scanpos = xsp;
-    if (jj_3R_350()) {
-    jj_scanpos = xsp;
-    if (jj_3R_351()) {
-    jj_scanpos = xsp;
-    if (jj_3R_352()) {
-    jj_scanpos = xsp;
-    if (jj_3R_353()) {
-    jj_scanpos = xsp;
-    if (jj_3R_354()) return true;
-    }
-    }
-    }
-    }
-    }
-    }
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_436()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  private boolean jj_3R_409()
+  private boolean jj_3R_290()
  {
-    if (jj_3R_417()) return true;
+    if (jj_scan_token(FUNCTIONHAS)) return true;
+    if (jj_3R_426()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
@@ -9527,15 +9984,15 @@ private boolean jj_3_6()
       if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
     }
     xsp = jj_scanpos;
-    if (jj_3R_220()) jj_scanpos = xsp;
+    if (jj_3R_226()) jj_scanpos = xsp;
     if (jj_scan_token(NUMBER)) return true;
     return false;
   }
 
-  private boolean jj_3R_287()
+  private boolean jj_3R_434()
  {
-    if (jj_scan_token(FUNCTIONHAS)) return true;
-    if (jj_3R_410()) return true;
+    if (jj_scan_token(DOT)) return true;
+    if (jj_3R_238()) return true;
     return false;
   }
 
@@ -9550,66 +10007,89 @@ private boolean jj_3_7()
     return false;
   }
 
-  private boolean jj_3R_271()
+  private boolean jj_3R_361()
  {
-    if (jj_scan_token(S)) return true;
+    if (jj_3R_254()) return true;
     return false;
   }
 
-  private boolean jj_3R_239()
+  private boolean jj_3R_289()
  {
+    if (jj_scan_token(FUNCTIONWHERE)) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_271()) { jj_scanpos = xsp; break; }
+      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
+    }
+    if (jj_3R_425()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
     }
-    if (jj_scan_token(MINUS)) return true;
     return false;
   }
 
-  private boolean jj_3_30()
+  private boolean jj_3R_278()
+ {
+    if (jj_scan_token(LPAREN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_277()
  {
     Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
-    }
     xsp = jj_scanpos;
-    if (jj_scan_token(52)) {
+    if (jj_3R_361()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(75)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(55)) return true;
+    if (jj_scan_token(41)) return true;
     }
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
+    return false;
+  }
+
+  private boolean jj_3R_247()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_277()) {
+    jj_scanpos = xsp;
+    if (jj_3R_278()) return true;
     }
-    if (jj_3R_240()) return true;
     return false;
   }
 
-  private boolean jj_3R_286()
+  private boolean jj_3R_424()
  {
-    if (jj_scan_token(FUNCTIONWHERE)) return true;
     Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(42)) {
+    jj_scanpos = xsp;
+    if (jj_3R_434()) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(109)) return true;
+    }
+    }
     while (true) {
       xsp = jj_scanpos;
       if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
     }
-    if (jj_3R_409()) return true;
     return false;
   }
 
-  private boolean jj_3R_408()
+  private boolean jj_3R_288()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(42)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(120)) {
+    if (jj_scan_token(122)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(109)) return true;
+    if (jj_scan_token(134)) return true;
     }
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
     }
+    if (jj_3R_425()) return true;
     while (true) {
       xsp = jj_scanpos;
       if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
@@ -9617,9 +10097,9 @@ private boolean jj_3R_408()
     return false;
   }
 
-  private boolean jj_3R_219()
+  private boolean jj_3R_225()
  {
-    if (jj_3R_247()) return true;
+    if (jj_3R_254()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
@@ -9628,34 +10108,38 @@ private boolean jj_3R_219()
     return false;
   }
 
-  private boolean jj_3R_285()
+  private boolean jj_3R_287()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(123)) {
+    if (jj_scan_token(121)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(135)) return true;
+    if (jj_scan_token(120)) return true;
     }
     while (true) {
       xsp = jj_scanpos;
       if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
     }
-    if (jj_3R_409()) return true;
+    if (jj_3R_240()) return true;
     return false;
   }
 
-  private boolean jj_3R_222()
+  private boolean jj_3R_275()
  {
-    if (jj_3R_247()) return true;
+    if (jj_3R_360()) return true;
     return false;
   }
 
-  private boolean jj_3R_423()
+  private boolean jj_3R_228()
+ {
+    if (jj_3R_254()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_442()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(145)) {
-    jj_scanpos = xsp;
     if (jj_scan_token(146)) {
     jj_scanpos = xsp;
     if (jj_scan_token(147)) {
@@ -9670,6 +10154,8 @@ private boolean jj_3R_423()
     jj_scanpos = xsp;
     if (jj_scan_token(152)) {
     jj_scanpos = xsp;
+    if (jj_scan_token(153)) {
+    jj_scanpos = xsp;
     if (jj_scan_token(55)) {
     jj_scanpos = xsp;
     if (jj_scan_token(50)) {
@@ -9715,47 +10201,67 @@ private boolean jj_3R_423()
     return false;
   }
 
-  private boolean jj_3R_416()
+  private boolean jj_3R_261()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_423()) jj_scanpos = xsp;
-    if (jj_3R_231()) return true;
+    if (jj_3R_287()) {
+    jj_scanpos = xsp;
+    if (jj_3R_288()) {
+    jj_scanpos = xsp;
+    if (jj_3R_289()) {
+    jj_scanpos = xsp;
+    if (jj_3R_290()) {
+    jj_scanpos = xsp;
+    if (jj_3R_291()) {
+    jj_scanpos = xsp;
+    if (jj_3R_292()) {
+    jj_scanpos = xsp;
+    if (jj_3R_293()) {
+    jj_scanpos = xsp;
+    if (jj_3R_294()) return true;
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    if (jj_scan_token(RPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_284()
+  private boolean jj_3R_274()
+ {
+    if (jj_3R_247()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_433()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(122)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(121)) return true;
-    }
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
-    }
-    if (jj_3R_233()) return true;
+    if (jj_3R_442()) jj_scanpos = xsp;
+    if (jj_3R_238()) return true;
     return false;
   }
 
-  private boolean jj_3R_399()
+  private boolean jj_3R_408()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_407()) {
+    if (jj_3R_423()) {
     jj_scanpos = xsp;
-    if (jj_3R_408()) return true;
+    if (jj_3R_424()) return true;
     }
     return false;
   }
 
-  private boolean jj_3R_407()
+  private boolean jj_3R_423()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_416()) {
+    if (jj_3R_433()) {
     jj_scanpos = xsp;
     if (jj_scan_token(45)) return true;
     }
@@ -9766,75 +10272,81 @@ private boolean jj_3R_407()
     return false;
   }
 
-  private boolean jj_3R_258()
+  private boolean jj_3R_453()
+ {
+    if (jj_3R_254()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_260()
+ {
+    if (jj_3R_238()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_245()
  {
+    if (jj_scan_token(DIV)) return true;
     Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
+    }
     xsp = jj_scanpos;
-    if (jj_3R_284()) {
-    jj_scanpos = xsp;
-    if (jj_3R_285()) {
-    jj_scanpos = xsp;
-    if (jj_3R_286()) {
-    jj_scanpos = xsp;
-    if (jj_3R_287()) {
-    jj_scanpos = xsp;
-    if (jj_3R_288()) {
-    jj_scanpos = xsp;
-    if (jj_3R_289()) {
-    jj_scanpos = xsp;
-    if (jj_3R_290()) {
+    if (jj_3R_274()) {
     jj_scanpos = xsp;
-    if (jj_3R_291()) return true;
-    }
-    }
-    }
-    }
-    }
-    }
+    if (jj_3R_275()) return true;
     }
     return false;
   }
 
-  private boolean jj_3R_433()
+  private boolean jj_3R_227()
  {
-    if (jj_3R_247()) return true;
+    if (jj_3R_254()) return true;
     return false;
   }
 
-  private boolean jj_3_29()
+  private boolean jj_3R_244()
  {
+    if (jj_scan_token(ANY)) return true;
     Token xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(28)) {
-    jj_scanpos = xsp;
-    if (jj_3R_239()) return true;
-    }
-    if (jj_scan_token(21)) return true;
     while (true) {
       xsp = jj_scanpos;
       if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
     }
+    if (jj_3R_273()) return true;
     return false;
   }
 
-  private boolean jj_3R_221()
+  private boolean jj_3R_445()
  {
-    if (jj_3R_247()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_453()) jj_scanpos = xsp;
+    if (jj_scan_token(DIMEN)) return true;
+    xsp = jj_scanpos;
+    if (jj_3_7()) jj_scanpos = xsp;
     return false;
   }
 
-  private boolean jj_3R_425()
+  private boolean jj_3_26()
  {
     Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
+    }
     xsp = jj_scanpos;
-    if (jj_3R_433()) jj_scanpos = xsp;
-    if (jj_scan_token(DIMEN)) return true;
+    if (jj_3R_244()) {
+    jj_scanpos = xsp;
+    if (jj_3R_245()) return true;
+    }
     return false;
   }
 
-  private boolean jj_3R_257()
+  private boolean jj_3R_272()
  {
-    if (jj_3R_231()) return true;
+    if (jj_scan_token(S)) return true;
     return false;
   }
 
@@ -9842,13 +10354,25 @@ private boolean jj_3_9()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_222()) jj_scanpos = xsp;
+    if (jj_3R_228()) jj_scanpos = xsp;
     if (jj_scan_token(AN)) return true;
     xsp = jj_scanpos;
     if (jj_3_6()) jj_scanpos = xsp;
     return false;
   }
 
+  private boolean jj_3R_232()
+ {
+    if (jj_scan_token(COLON)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_260()) {
+    jj_scanpos = xsp;
+    if (jj_3R_261()) return true;
+    }
+    return false;
+  }
+
   private boolean jj_3_5()
  {
     Token xsp;
@@ -9857,26 +10381,30 @@ private boolean jj_3_5()
       if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
     }
     xsp = jj_scanpos;
-    if (jj_3R_219()) jj_scanpos = xsp;
+    if (jj_3R_225()) jj_scanpos = xsp;
     if (jj_scan_token(NUMBER)) return true;
     return false;
   }
 
-  private boolean jj_3R_227()
+  private boolean jj_3R_243()
  {
-    if (jj_scan_token(COLON)) return true;
     Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_257()) {
-    jj_scanpos = xsp;
-    if (jj_3R_258()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_272()) { jj_scanpos = xsp; break; }
     }
+    if (jj_scan_token(MINUS)) return true;
     return false;
   }
 
-  private boolean jj_3R_398()
+  private boolean jj_3R_418()
  {
-    if (jj_scan_token(COLON)) return true;
+    if (jj_3R_273()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3_26()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
@@ -9884,82 +10412,59 @@ private boolean jj_3_8()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_221()) jj_scanpos = xsp;
+    if (jj_3R_227()) jj_scanpos = xsp;
     if (jj_scan_token(NUMBER)) return true;
     return false;
   }
 
-  private boolean jj_3R_391()
+  private boolean jj_3R_407()
  {
-    if (jj_scan_token(LPAREN)) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
-    }
-    if (jj_scan_token(IDENT)) return true;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
-    }
-    xsp = jj_scanpos;
-    if (jj_3R_398()) jj_scanpos = xsp;
-    if (jj_scan_token(RPAREN)) return true;
+    if (jj_scan_token(COLON)) return true;
     return false;
   }
 
-  private boolean jj_3R_356()
+  private boolean jj_3R_444()
  {
-    if (jj_3R_247()) return true;
+    if (jj_3R_238()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3_5()) jj_scanpos = xsp;
     return false;
   }
 
-  private boolean jj_3R_419()
+  private boolean jj_3R_439()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_424()) {
+    if (jj_3R_444()) {
     jj_scanpos = xsp;
     if (jj_3_8()) {
     jj_scanpos = xsp;
     if (jj_3_9()) {
     jj_scanpos = xsp;
-    if (jj_3R_425()) return true;
+    if (jj_3R_445()) return true;
     }
     }
     }
     return false;
   }
 
-  private boolean jj_3R_424()
- {
-    if (jj_3R_231()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_273()
+  private boolean jj_3R_393()
  {
     if (jj_scan_token(LPAREN)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_272()
- {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_356()) jj_scanpos = xsp;
-    if (jj_scan_token(NUMBER)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_240()
- {
     Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_272()) {
-    jj_scanpos = xsp;
-    if (jj_3R_273()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
+    }
+    if (jj_scan_token(IDENT)) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
     }
+    xsp = jj_scanpos;
+    if (jj_3R_407()) jj_scanpos = xsp;
+    if (jj_scan_token(RPAREN)) return true;
     return false;
   }
 
@@ -9971,11 +10476,11 @@ private boolean jj_3_2()
       xsp = jj_scanpos;
       if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
     }
-    if (jj_3R_216()) return true;
+    if (jj_3R_222()) return true;
     return false;
   }
 
-  private boolean jj_3R_274()
+  private boolean jj_3R_280()
  {
     Token xsp;
     xsp = jj_scanpos;
@@ -9983,129 +10488,99 @@ private boolean jj_3R_274()
     jj_scanpos = xsp;
     if (jj_3_3()) {
     jj_scanpos = xsp;
-    if (jj_3R_357()) return true;
+    if (jj_3R_362()) return true;
     }
     }
     return false;
   }
 
-  private boolean jj_3R_278()
- {
-    if (jj_scan_token(PLUS)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_277()
- {
-    if (jj_scan_token(MINUS)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_247()
+  private boolean jj_3_25()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_277()) {
+    if (jj_scan_token(28)) {
     jj_scanpos = xsp;
-    if (jj_3R_278()) return true;
+    if (jj_3R_243()) return true;
+    }
+    if (jj_scan_token(21)) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  private boolean jj_3R_270()
- {
-    if (jj_3R_355()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_255()
+  private boolean jj_3R_284()
  {
-    if (jj_3R_231()) return true;
+    if (jj_scan_token(PLUS)) return true;
     return false;
   }
 
-  private boolean jj_3R_269()
+  private boolean jj_3R_258()
  {
-    if (jj_3R_240()) return true;
+    if (jj_3R_238()) return true;
     return false;
   }
 
-  private boolean jj_3R_256()
+  private boolean jj_3R_283()
  {
-    if (jj_scan_token(FUNCTIONSLOTTED)) return true;
+    if (jj_scan_token(MINUS)) return true;
     return false;
   }
 
-  private boolean jj_3R_243()
+  private boolean jj_3R_254()
  {
-    if (jj_3R_274()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_283()) {
+    jj_scanpos = xsp;
+    if (jj_3R_284()) return true;
+    }
     return false;
   }
 
-  private boolean jj_3R_238()
+  private boolean jj_3R_259()
  {
-    if (jj_scan_token(DIV)) return true;
+    if (jj_scan_token(FUNCTIONSLOTTED)) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
       if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
     }
-    xsp = jj_scanpos;
-    if (jj_3R_269()) {
-    jj_scanpos = xsp;
-    if (jj_3R_270()) return true;
-    }
+    if (jj_3R_230()) return true;
     return false;
   }
 
-  private boolean jj_3R_362()
- {
-    if (jj_scan_token(TWOPIPES)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_237()
+  private boolean jj_3R_400()
  {
-    if (jj_scan_token(ANY)) return true;
+    if (jj_3R_418()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
+      if (jj_3_25()) { jj_scanpos = xsp; break; }
     }
-    if (jj_3R_268()) return true;
     return false;
   }
 
-  private boolean jj_3R_361()
+  private boolean jj_3R_367()
  {
-    if (jj_scan_token(TILDE)) return true;
+    if (jj_scan_token(TWOPIPES)) return true;
     return false;
   }
 
-  private boolean jj_3R_216()
+  private boolean jj_3R_250()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_242()) {
-    jj_scanpos = xsp;
-    if (jj_3R_243()) return true;
-    }
+    if (jj_3R_280()) return true;
     return false;
   }
 
-  private boolean jj_3R_242()
+  private boolean jj_3R_366()
  {
-    if (jj_scan_token(NOT)) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
-    }
-    if (jj_3R_274()) return true;
+    if (jj_scan_token(TILDE)) return true;
     return false;
   }
 
-  private boolean jj_3R_280()
+  private boolean jj_3R_286()
  {
     Token xsp;
     if (jj_scan_token(21)) return true;
@@ -10116,131 +10591,128 @@ private boolean jj_3R_280()
     return false;
   }
 
-  private boolean jj_3R_360()
+  private boolean jj_3R_365()
  {
     if (jj_scan_token(GREATER)) return true;
     return false;
   }
 
-  private boolean jj_3R_359()
+  private boolean jj_3R_364()
  {
     if (jj_scan_token(PLUS)) return true;
     return false;
   }
 
-  private boolean jj_3R_279()
+  private boolean jj_3R_222()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_359()) {
-    jj_scanpos = xsp;
-    if (jj_3R_360()) {
-    jj_scanpos = xsp;
-    if (jj_3R_361()) {
+    if (jj_3R_249()) {
     jj_scanpos = xsp;
-    if (jj_3R_362()) return true;
-    }
-    }
+    if (jj_3R_250()) return true;
     }
+    return false;
+  }
+
+  private boolean jj_3R_249()
+ {
+    if (jj_scan_token(NOT)) return true;
+    Token xsp;
     while (true) {
       xsp = jj_scanpos;
       if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
     }
+    if (jj_3R_280()) return true;
     return false;
   }
 
-  private boolean jj_3_28()
+  private boolean jj_3R_285()
  {
     Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_364()) {
+    jj_scanpos = xsp;
+    if (jj_3R_365()) {
+    jj_scanpos = xsp;
+    if (jj_3R_366()) {
+    jj_scanpos = xsp;
+    if (jj_3R_367()) return true;
+    }
+    }
+    }
     while (true) {
       xsp = jj_scanpos;
       if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
     }
-    xsp = jj_scanpos;
-    if (jj_3R_237()) {
-    jj_scanpos = xsp;
-    if (jj_3R_238()) return true;
-    }
     return false;
   }
 
-  private boolean jj_3R_267()
+  private boolean jj_3R_255()
  {
-    if (jj_scan_token(S)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_285()) {
+    jj_scanpos = xsp;
+    if (jj_3R_286()) return true;
+    }
     return false;
   }
 
-  private boolean jj_3R_248()
+  private boolean jj_3R_231()
  {
+    if (jj_scan_token(PSEUDOELEMENT_SYM)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_279()) {
+    if (jj_3R_258()) {
     jj_scanpos = xsp;
-    if (jj_3R_280()) return true;
+    if (jj_3R_259()) return true;
     }
     return false;
   }
 
   private boolean jj_3_1()
  {
-    if (jj_3R_216()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_236()
- {
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_267()) { jj_scanpos = xsp; break; }
-    }
-    if (jj_scan_token(MINUS)) return true;
+    if (jj_3R_222()) return true;
     return false;
   }
 
-  private boolean jj_3R_406()
+  private boolean jj_3R_267()
  {
-    if (jj_3R_268()) return true;
+    if (jj_scan_token(COMMA)) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3_28()) { jj_scanpos = xsp; break; }
+      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  private boolean jj_3R_226()
+  private boolean jj_3R_239()
  {
-    if (jj_scan_token(PSEUDOELEMENT_SYM)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_255()) {
-    jj_scanpos = xsp;
-    if (jj_3R_256()) return true;
-    }
+    if (jj_3R_267()) jj_scanpos = xsp;
     return false;
   }
 
-  private boolean jj_3R_262()
+  private boolean jj_3R_371()
  {
-    if (jj_scan_token(COMMA)) return true;
+    if (jj_scan_token(FUNCTIONCALC)) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
       if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
     }
+    if (jj_3R_400()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
+    }
+    if (jj_scan_token(RPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_232()
- {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_262()) jj_scanpos = xsp;
-    return false;
-  }
-
-  private boolean jj_3R_397()
+  private boolean jj_3R_406()
  {
     if (jj_scan_token(NUMBER)) return true;
     Token xsp;
@@ -10257,73 +10729,83 @@ private boolean jj_3R_397()
     return false;
   }
 
-  private boolean jj_3_27()
+  private boolean jj_3R_373()
  {
+    if (jj_scan_token(FUNCTIONCLAMP)) return true;
     Token xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(28)) {
-    jj_scanpos = xsp;
-    if (jj_3R_236()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
     }
-    if (jj_scan_token(21)) return true;
+    if (jj_3R_400()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
+    }
+    if (jj_scan_token(COMMA)) return true;
     while (true) {
       xsp = jj_scanpos;
       if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
     }
+    if (jj_3R_400()) return true;
     return false;
   }
 
-  private boolean jj_3R_395()
+  private boolean jj_3R_454()
  {
-    if (jj_3R_406()) return true;
+    if (jj_scan_token(COMMA)) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3_27()) { jj_scanpos = xsp; break; }
+      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
     }
+    if (jj_3R_400()) return true;
     return false;
   }
 
-  private boolean jj_3R_367()
+  private boolean jj_3R_404()
  {
-    if (jj_scan_token(FUNCTIONCALC)) return true;
+    if (jj_3R_422()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_420()
+ {
+    if (jj_scan_token(FUNCTIONMATH2)) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
       if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
     }
-    if (jj_3R_395()) return true;
+    if (jj_3R_400()) return true;
     while (true) {
       xsp = jj_scanpos;
       if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
     }
+    xsp = jj_scanpos;
+    if (jj_3R_454()) jj_scanpos = xsp;
     if (jj_scan_token(RPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_370()
+  private boolean jj_3R_419()
  {
-    if (jj_scan_token(FUNCTIONCLAMP)) return true;
+    if (jj_scan_token(FUNCTIONMATH1)) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
       if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
     }
-    if (jj_3R_395()) return true;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
-    }
-    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_400()) return true;
     while (true) {
       xsp = jj_scanpos;
       if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
     }
-    if (jj_3R_395()) return true;
+    if (jj_scan_token(RPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_421()
+  private boolean jj_3R_456()
  {
     if (jj_scan_token(COMMA)) return true;
     Token xsp;
@@ -10331,266 +10813,321 @@ private boolean jj_3R_421()
       xsp = jj_scanpos;
       if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
     }
-    if (jj_3R_395()) return true;
+    if (jj_3R_400()) return true;
     return false;
   }
 
-  private boolean jj_3R_261()
+  private boolean jj_3_24()
  {
-    if (jj_3R_231()) return true;
+    if (jj_scan_token(IDENT)) return true;
     return false;
   }
 
-  private boolean jj_3R_230()
+  private boolean jj_3R_403()
+ {
+    if (jj_3R_421()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_432()
+ {
+    if (jj_3R_400()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_266()
+ {
+    if (jj_3R_238()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_237()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_261()) {
+    if (jj_3R_266()) {
     jj_scanpos = xsp;
     if (jj_scan_token(55)) return true;
     }
     return false;
   }
 
-  private boolean jj_3_21()
+  private boolean jj_3R_455()
  {
+    if (jj_scan_token(COMMA)) return true;
     Token xsp;
-    if (jj_scan_token(21)) return true;
     while (true) {
       xsp = jj_scanpos;
       if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
     }
-    if (jj_3R_231()) return true;
+    if (jj_3R_400()) return true;
     return false;
   }
 
-  private boolean jj_3_20()
- {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_230()) jj_scanpos = xsp;
-    if (jj_scan_token(152)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_368()
+  private boolean jj_3R_422()
  {
-    if (jj_scan_token(FUNCTIONMAX)) return true;
+    if (jj_scan_token(FUNCTIONROUND)) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
       if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
     }
-    if (jj_3R_395()) return true;
+    xsp = jj_scanpos;
+    if (jj_3_24()) {
+    jj_scanpos = xsp;
+    if (jj_3R_432()) return true;
+    }
     while (true) {
       xsp = jj_scanpos;
       if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
     }
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_421()) { jj_scanpos = xsp; break; }
+      if (jj_3R_456()) { jj_scanpos = xsp; break; }
     }
     if (jj_scan_token(RPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_422()
+  private boolean jj_3R_402()
+ {
+    if (jj_3R_420()) return true;
+    return false;
+  }
+
+  private boolean jj_3_18()
  {
-    if (jj_scan_token(COMMA)) return true;
     Token xsp;
+    if (jj_scan_token(21)) return true;
     while (true) {
       xsp = jj_scanpos;
       if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
     }
-    if (jj_3R_395()) return true;
+    if (jj_3R_238()) return true;
     return false;
   }
 
-  private boolean jj_3R_405()
+  private boolean jj_3_17()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_237()) jj_scanpos = xsp;
+    if (jj_scan_token(153)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_417()
+ {
+    if (jj_scan_token(STRING)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_416()
+ {
+    if (jj_3R_238()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_421()
+ {
+    if (jj_scan_token(FUNCTIONMATHN)) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
+    }
+    if (jj_3R_400()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
+    }
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_455()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_scan_token(RPAREN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_415()
  {
     if (jj_scan_token(SUBSTRINGMATCH)) return true;
     return false;
   }
 
-  private boolean jj_3R_404()
+  private boolean jj_3R_414()
  {
     if (jj_scan_token(SUFFIXMATCH)) return true;
     return false;
   }
 
-  private boolean jj_3R_403()
+  private boolean jj_3R_413()
  {
     if (jj_scan_token(PREFIXMATCH)) return true;
     return false;
   }
 
-  private boolean jj_3R_402()
+  private boolean jj_3R_412()
  {
     if (jj_scan_token(DASHMATCH)) return true;
     return false;
   }
 
-  private boolean jj_3R_400()
+  private boolean jj_3R_410()
  {
     if (jj_scan_token(EQ)) return true;
     return false;
   }
 
-  private boolean jj_3R_401()
+  private boolean jj_3R_411()
  {
     if (jj_scan_token(INCLUDES)) return true;
     return false;
   }
 
-  private boolean jj_3R_394()
+  private boolean jj_3R_399()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_400()) {
+    if (jj_3R_410()) {
     jj_scanpos = xsp;
-    if (jj_3R_401()) {
+    if (jj_3R_411()) {
     jj_scanpos = xsp;
-    if (jj_3R_402()) {
+    if (jj_3R_412()) {
     jj_scanpos = xsp;
-    if (jj_3R_403()) {
+    if (jj_3R_413()) {
     jj_scanpos = xsp;
-    if (jj_3R_404()) {
+    if (jj_3R_414()) {
     jj_scanpos = xsp;
-    if (jj_3R_405()) return true;
+    if (jj_3R_415()) return true;
     }
     }
     }
     }
     }
-    return false;
-  }
-
-  private boolean jj_3R_283()
- {
-    if (jj_scan_token(LBRACKET)) return true;
-    Token xsp;
     while (true) {
       xsp = jj_scanpos;
       if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
     }
     xsp = jj_scanpos;
-    if (jj_3_20()) jj_scanpos = xsp;
-    if (jj_3R_231()) return true;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
+    if (jj_3R_416()) {
+    jj_scanpos = xsp;
+    if (jj_3R_417()) return true;
     }
+    return false;
+  }
+
+  private boolean jj_3R_401()
+ {
+    if (jj_3R_419()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_372()
+ {
+    Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_394()) jj_scanpos = xsp;
-    if (jj_scan_token(RBRACKET)) return true;
+    if (jj_3R_401()) {
+    jj_scanpos = xsp;
+    if (jj_3R_402()) {
+    jj_scanpos = xsp;
+    if (jj_3R_403()) {
+    jj_scanpos = xsp;
+    if (jj_3R_404()) return true;
+    }
+    }
+    }
     return false;
   }
 
-  private boolean jj_3R_369()
+  private boolean jj_3R_370()
  {
-    if (jj_scan_token(FUNCTIONMIN)) return true;
+    if (jj_scan_token(LBRACKET)) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
       if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
     }
-    if (jj_3R_395()) return true;
+    xsp = jj_scanpos;
+    if (jj_3_17()) jj_scanpos = xsp;
+    if (jj_3R_238()) return true;
     while (true) {
       xsp = jj_scanpos;
       if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
     }
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_422()) { jj_scanpos = xsp; break; }
-    }
-    if (jj_scan_token(RPAREN)) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_399()) jj_scanpos = xsp;
+    if (jj_scan_token(RBRACKET)) return true;
     return false;
   }
 
-  private boolean jj_3R_346()
+  private boolean jj_3R_352()
  {
     if (jj_scan_token(UNICODERANGE)) return true;
     return false;
   }
 
-  private boolean jj_3R_345()
+  private boolean jj_3R_351()
  {
     if (jj_scan_token(URL)) return true;
     return false;
   }
 
-  private boolean jj_3R_344()
+  private boolean jj_3R_350()
  {
-    if (jj_3R_373()) return true;
+    if (jj_3R_376()) return true;
     return false;
   }
 
-  private boolean jj_3_13()
+  private boolean jj_3R_264()
  {
-    if (jj_3R_227()) return true;
+    if (jj_3R_232()) return true;
     return false;
   }
 
-  private boolean jj_3R_293()
+  private boolean jj_3R_296()
  {
     if (jj_scan_token(ANY)) return true;
     return false;
   }
 
-  private boolean jj_3R_292()
+  private boolean jj_3R_295()
  {
-    if (jj_3R_231()) return true;
+    if (jj_3R_238()) return true;
     return false;
   }
 
-  private boolean jj_3R_342()
+  private boolean jj_3R_348()
  {
     if (jj_scan_token(STRING)) return true;
     return false;
   }
 
-  private boolean jj_3R_260()
- {
-    if (jj_3R_231()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_229()
- {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_260()) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(55)) return true;
-    }
-    return false;
-  }
-
-  private boolean jj_3R_343()
+  private boolean jj_3R_349()
  {
-    if (jj_3R_231()) return true;
+    if (jj_3R_238()) return true;
     return false;
   }
 
-  private boolean jj_3R_380()
+  private boolean jj_3R_382()
  {
-    if (jj_3R_370()) return true;
+    if (jj_3R_373()) return true;
     return false;
   }
 
-  private boolean jj_3R_266()
+  private boolean jj_3R_271()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_342()) {
+    if (jj_3R_348()) {
     jj_scanpos = xsp;
-    if (jj_3R_343()) {
+    if (jj_3R_349()) {
     jj_scanpos = xsp;
-    if (jj_3R_344()) {
+    if (jj_3R_350()) {
     jj_scanpos = xsp;
-    if (jj_3R_345()) {
+    if (jj_3R_351()) {
     jj_scanpos = xsp;
-    if (jj_3R_346()) return true;
+    if (jj_3R_352()) return true;
     }
     }
     }
@@ -10602,97 +11139,110 @@ private boolean jj_3R_266()
     return false;
   }
 
-  private boolean jj_3R_379()
+  private boolean jj_3R_381()
  {
-    if (jj_3R_369()) return true;
+    if (jj_3R_372()) return true;
     return false;
   }
 
-  private boolean jj_3R_378()
+  private boolean jj_3R_380()
  {
-    if (jj_3R_368()) return true;
+    if (jj_3R_371()) return true;
     return false;
   }
 
-  private boolean jj_3R_377()
+  private boolean jj_3R_379()
  {
-    if (jj_3R_367()) return true;
+    if (jj_3R_375()) return true;
     return false;
   }
 
-  private boolean jj_3R_376()
+  private boolean jj_3R_265()
  {
-    if (jj_3R_372()) return true;
+    if (jj_3R_238()) return true;
     return false;
   }
 
-  private boolean jj_3R_341()
+  private boolean jj_3R_236()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_376()) {
+    if (jj_3R_265()) {
     jj_scanpos = xsp;
-    if (jj_3R_377()) {
+    if (jj_scan_token(55)) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_347()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_379()) {
     jj_scanpos = xsp;
-    if (jj_3R_378()) {
+    if (jj_3R_380()) {
     jj_scanpos = xsp;
-    if (jj_3R_379()) {
+    if (jj_3R_381()) {
     jj_scanpos = xsp;
-    if (jj_3R_380()) return true;
-    }
+    if (jj_3R_382()) return true;
     }
     }
     }
     return false;
   }
 
-  private boolean jj_3_19()
+  private boolean jj_3R_346()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_229()) jj_scanpos = xsp;
-    if (jj_scan_token(152)) return true;
+    if (jj_scan_token(DIMEN_9)) return true;
     return false;
   }
 
-  private boolean jj_3R_340()
+  private boolean jj_3_16()
  {
-    if (jj_scan_token(DIMEN_9)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_236()) jj_scanpos = xsp;
+    if (jj_scan_token(153)) return true;
     return false;
   }
 
-  private boolean jj_3R_259()
+  private boolean jj_3R_262()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3_19()) jj_scanpos = xsp;
+    if (jj_3_16()) jj_scanpos = xsp;
     xsp = jj_scanpos;
-    if (jj_3R_292()) {
+    if (jj_3R_295()) {
     jj_scanpos = xsp;
-    if (jj_3R_293()) return true;
+    if (jj_3R_296()) return true;
     }
     return false;
   }
 
-  private boolean jj_3R_339()
+  private boolean jj_3R_345()
  {
     if (jj_scan_token(IMPORTANT_NOT)) return true;
     return false;
   }
 
-  private boolean jj_3_12()
+  private boolean jj_3R_344()
  {
-    if (jj_3R_226()) return true;
+    if (jj_scan_token(DIMEN)) return true;
     return false;
   }
 
-  private boolean jj_3R_338()
+  private boolean jj_3R_235()
  {
-    if (jj_scan_token(DIMEN)) return true;
+    if (jj_3R_231()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_264()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
-  private boolean jj_3_26()
+  private boolean jj_3_23()
  {
     if (jj_scan_token(NUMBER)) return true;
     Token xsp;
@@ -10704,154 +11254,142 @@ private boolean jj_3_26()
     return false;
   }
 
-  private boolean jj_3R_337()
+  private boolean jj_3R_343()
  {
     if (jj_scan_token(SPL)) return true;
     return false;
   }
 
-  private boolean jj_3R_336()
+  private boolean jj_3R_342()
  {
     if (jj_scan_token(ST)) return true;
     return false;
   }
 
-  private boolean jj_3R_335()
+  private boolean jj_3R_341()
  {
     if (jj_scan_token(RESOLUTION)) return true;
     return false;
   }
 
-  private boolean jj_3R_334()
+  private boolean jj_3R_340()
  {
     if (jj_scan_token(FREQ)) return true;
     return false;
   }
 
-  private boolean jj_3R_333()
+  private boolean jj_3R_339()
  {
     if (jj_scan_token(TIME)) return true;
     return false;
   }
 
-  private boolean jj_3R_332()
+  private boolean jj_3R_338()
  {
     if (jj_scan_token(ANGLE)) return true;
     return false;
   }
 
-  private boolean jj_3R_331()
+  private boolean jj_3R_337()
  {
     if (jj_scan_token(FLEX)) return true;
     return false;
   }
 
-  private boolean jj_3R_393()
- {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(61)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(62)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(63)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(65)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(68)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(69)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(70)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(73)) return true;
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    return false;
-  }
-
-  private boolean jj_3R_330()
+  private boolean jj_3R_336()
  {
     if (jj_scan_token(ABSOLUTLENGTH)) return true;
     return false;
   }
 
-  private boolean jj_3R_329()
+  private boolean jj_3R_335()
  {
     if (jj_scan_token(RELVIEWLENGTH)) return true;
     return false;
   }
 
-  private boolean jj_3R_328()
+  private boolean jj_3R_334()
  {
     if (jj_scan_token(RELFONTLENGTH)) return true;
     return false;
   }
 
-  private boolean jj_3R_327()
+  private boolean jj_3R_333()
  {
     if (jj_scan_token(PERCENTAGE)) return true;
     return false;
   }
 
-  private boolean jj_3R_374()
+  private boolean jj_3R_377()
  {
-    if (jj_3R_397()) return true;
+    if (jj_3R_406()) return true;
     return false;
   }
 
-  private boolean jj_3R_375()
+  private boolean jj_3R_378()
  {
     if (jj_scan_token(NUMBER)) return true;
     return false;
   }
 
-  private boolean jj_3R_326()
+  private boolean jj_3R_409()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_374()) {
+    if (jj_scan_token(61)) {
     jj_scanpos = xsp;
-    if (jj_3R_375()) return true;
+    if (jj_scan_token(62)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(63)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(65)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(68)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(69)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(70)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(73)) return true;
+    }
+    }
+    }
+    }
+    }
+    }
     }
     return false;
   }
 
-  private boolean jj_3R_325()
+  private boolean jj_3R_332()
  {
-    if (jj_3R_247()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_377()) {
+    jj_scanpos = xsp;
+    if (jj_3R_378()) return true;
+    }
     return false;
   }
 
-  private boolean jj_3_15()
+  private boolean jj_3R_331()
+ {
+    if (jj_3R_254()) return true;
+    return false;
+  }
+
+  private boolean jj_3_12()
  {
-    if (jj_3R_227()) return true;
+    if (jj_3R_232()) return true;
     return false;
   }
 
-  private boolean jj_3R_265()
+  private boolean jj_3R_270()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_325()) jj_scanpos = xsp;
+    if (jj_3R_331()) jj_scanpos = xsp;
     xsp = jj_scanpos;
-    if (jj_3R_326()) {
-    jj_scanpos = xsp;
-    if (jj_3R_327()) {
-    jj_scanpos = xsp;
-    if (jj_3R_328()) {
-    jj_scanpos = xsp;
-    if (jj_3R_329()) {
-    jj_scanpos = xsp;
-    if (jj_3R_330()) {
-    jj_scanpos = xsp;
-    if (jj_3R_331()) {
-    jj_scanpos = xsp;
     if (jj_3R_332()) {
     jj_scanpos = xsp;
     if (jj_3R_333()) {
@@ -10870,7 +11408,19 @@ private boolean jj_3R_265()
     jj_scanpos = xsp;
     if (jj_3R_340()) {
     jj_scanpos = xsp;
-    if (jj_3R_341()) return true;
+    if (jj_3R_341()) {
+    jj_scanpos = xsp;
+    if (jj_3R_342()) {
+    jj_scanpos = xsp;
+    if (jj_3R_343()) {
+    jj_scanpos = xsp;
+    if (jj_3R_344()) {
+    jj_scanpos = xsp;
+    if (jj_3R_345()) {
+    jj_scanpos = xsp;
+    if (jj_3R_346()) {
+    jj_scanpos = xsp;
+    if (jj_3R_347()) return true;
     }
     }
     }
@@ -10893,54 +11443,54 @@ private boolean jj_3R_265()
     return false;
   }
 
-  private boolean jj_3R_235()
+  private boolean jj_3R_242()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_265()) {
+    if (jj_3R_270()) {
     jj_scanpos = xsp;
-    if (jj_3R_266()) return true;
+    if (jj_3R_271()) return true;
     }
     return false;
   }
 
-  private boolean jj_3_25()
+  private boolean jj_3_22()
  {
     if (jj_scan_token(S)) return true;
     return false;
   }
 
-  private boolean jj_3R_324()
+  private boolean jj_3R_330()
  {
     if (jj_scan_token(UNICODERANGE)) return true;
     return false;
   }
 
-  private boolean jj_3R_323()
+  private boolean jj_3R_329()
  {
     if (jj_scan_token(URL)) return true;
     return false;
   }
 
-  private boolean jj_3R_322()
+  private boolean jj_3R_328()
  {
-    if (jj_3R_373()) return true;
+    if (jj_3R_376()) return true;
     return false;
   }
 
-  private boolean jj_3_16()
+  private boolean jj_3_13()
  {
-    if (jj_3R_227()) return true;
+    if (jj_3R_232()) return true;
     return false;
   }
 
-  private boolean jj_3_11()
+  private boolean jj_3R_234()
  {
-    if (jj_3R_225()) return true;
+    if (jj_3R_263()) return true;
     return false;
   }
 
-  private boolean jj_3R_275()
+  private boolean jj_3R_281()
  {
     Token xsp;
     xsp = jj_scanpos;
@@ -10950,9 +11500,9 @@ private boolean jj_3R_275()
     jj_scanpos = xsp;
     if (jj_scan_token(50)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(151)) {
+    if (jj_scan_token(152)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(153)) return true;
+    if (jj_scan_token(154)) return true;
     }
     }
     }
@@ -10960,13 +11510,13 @@ private boolean jj_3R_275()
     return false;
   }
 
-  private boolean jj_3R_321()
+  private boolean jj_3R_327()
  {
-    if (jj_3R_231()) return true;
+    if (jj_3R_238()) return true;
     return false;
   }
 
-  private boolean jj_3R_320()
+  private boolean jj_3R_326()
  {
     Token xsp;
     xsp = jj_scanpos;
@@ -10977,84 +11527,58 @@ private boolean jj_3R_320()
     return false;
   }
 
-  private boolean jj_3R_319()
+  private boolean jj_3R_325()
  {
     if (jj_scan_token(DIV)) return true;
     return false;
   }
 
-  private boolean jj_3R_318()
+  private boolean jj_3R_324()
  {
     if (jj_scan_token(STRING)) return true;
     return false;
   }
 
-  private boolean jj_3R_317()
- {
-    if (jj_3R_372()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_316()
- {
-    if (jj_3R_355()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_315()
+  private boolean jj_3R_323()
  {
-    if (jj_3R_371()) return true;
+    if (jj_3R_375()) return true;
     return false;
   }
 
-  private boolean jj_3R_314()
+  private boolean jj_3R_322()
  {
-    if (jj_3R_370()) return true;
+    if (jj_3R_360()) return true;
     return false;
   }
 
-  private boolean jj_3R_313()
+  private boolean jj_3R_321()
  {
-    if (jj_3R_369()) return true;
+    if (jj_3R_374()) return true;
     return false;
   }
 
-  private boolean jj_3R_312()
+  private boolean jj_3R_320()
  {
-    if (jj_3R_368()) return true;
+    if (jj_3R_373()) return true;
     return false;
   }
 
-  private boolean jj_3R_311()
+  private boolean jj_3R_319()
  {
-    if (jj_3R_367()) return true;
+    if (jj_3R_372()) return true;
     return false;
   }
 
-  private boolean jj_3_14()
+  private boolean jj_3R_318()
  {
-    if (jj_3R_226()) return true;
+    if (jj_3R_371()) return true;
     return false;
   }
 
-  private boolean jj_3R_264()
+  private boolean jj_3R_269()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_311()) {
-    jj_scanpos = xsp;
-    if (jj_3R_312()) {
-    jj_scanpos = xsp;
-    if (jj_3R_313()) {
-    jj_scanpos = xsp;
-    if (jj_3R_314()) {
-    jj_scanpos = xsp;
-    if (jj_3R_315()) {
-    jj_scanpos = xsp;
-    if (jj_3R_316()) {
-    jj_scanpos = xsp;
-    if (jj_3R_317()) {
-    jj_scanpos = xsp;
     if (jj_3R_318()) {
     jj_scanpos = xsp;
     if (jj_3R_319()) {
@@ -11067,8 +11591,19 @@ private boolean jj_3R_264()
     jj_scanpos = xsp;
     if (jj_3R_323()) {
     jj_scanpos = xsp;
-    if (jj_3R_324()) return true;
-    }
+    if (jj_3R_324()) {
+    jj_scanpos = xsp;
+    if (jj_3R_325()) {
+    jj_scanpos = xsp;
+    if (jj_3R_326()) {
+    jj_scanpos = xsp;
+    if (jj_3R_327()) {
+    jj_scanpos = xsp;
+    if (jj_3R_328()) {
+    jj_scanpos = xsp;
+    if (jj_3R_329()) {
+    jj_scanpos = xsp;
+    if (jj_3R_330()) return true;
     }
     }
     }
@@ -11084,243 +11619,236 @@ private boolean jj_3R_264()
     return false;
   }
 
-  private boolean jj_3R_366()
+  private boolean jj_3_11()
  {
-    if (jj_3R_393()) return true;
+    if (jj_3R_231()) return true;
     return false;
   }
 
-  private boolean jj_3R_310()
+  private boolean jj_3R_317()
  {
     if (jj_scan_token(DIMEN_9)) return true;
     return false;
   }
 
-  private boolean jj_3R_228()
+  private boolean jj_3R_398()
  {
-    if (jj_3R_259()) return true;
+    if (jj_3R_409()) return true;
     return false;
   }
 
-  private boolean jj_3R_309()
+  private boolean jj_3R_233()
+ {
+    if (jj_3R_262()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_316()
  {
     if (jj_scan_token(IMPORTANT_NOT)) return true;
     return false;
   }
 
-  private boolean jj_3R_282()
+  private boolean jj_3R_315()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_365()) {
-    jj_scanpos = xsp;
-    if (jj_3R_366()) return true;
-    }
+    if (jj_scan_token(PROGID)) return true;
     return false;
   }
 
-  private boolean jj_3R_365()
+  private boolean jj_3R_369()
  {
-    if (jj_scan_token(CLASS)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_397()) {
+    jj_scanpos = xsp;
+    if (jj_3R_398()) return true;
+    }
     return false;
   }
 
-  private boolean jj_3_17()
+  private boolean jj_3R_397()
  {
-    if (jj_3R_226()) return true;
+    if (jj_scan_token(DOT)) return true;
+    if (jj_3R_238()) return true;
     return false;
   }
 
-  private boolean jj_3R_308()
+  private boolean jj_3_14()
  {
-    if (jj_scan_token(PROGID)) return true;
+    if (jj_3R_231()) return true;
     return false;
   }
 
-  private boolean jj_3R_250()
+  private boolean jj_3R_257()
  {
     Token xsp;
-    if (jj_3_17()) return true;
+    if (jj_3_14()) return true;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3_17()) { jj_scanpos = xsp; break; }
+      if (jj_3_14()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  private boolean jj_3R_249()
+  private boolean jj_3R_256()
  {
-    if (jj_3R_259()) return true;
+    if (jj_3R_262()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3_14()) { jj_scanpos = xsp; break; }
+      if (jj_3_11()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  private boolean jj_3_18()
+  private boolean jj_3_15()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_228()) jj_scanpos = xsp;
-    if (jj_3_11()) return true;
+    if (jj_3R_233()) jj_scanpos = xsp;
+    if (jj_3R_234()) return true;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3_11()) { jj_scanpos = xsp; break; }
+      if (jj_3R_234()) { jj_scanpos = xsp; break; }
     }
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3_12()) { jj_scanpos = xsp; break; }
+      if (jj_3R_235()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  private boolean jj_3R_224()
+  private boolean jj_3R_314()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3_18()) {
-    jj_scanpos = xsp;
-    if (jj_3R_249()) {
-    jj_scanpos = xsp;
-    if (jj_3R_250()) return true;
-    }
-    }
+    if (jj_scan_token(DIMEN)) return true;
     return false;
   }
 
-  private boolean jj_3R_231()
+  private boolean jj_3R_313()
+ {
+    if (jj_scan_token(SPL)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_230()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(41)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(35)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(36)) {
+    if (jj_3_15()) {
     jj_scanpos = xsp;
-    if (jj_scan_token(38)) {
+    if (jj_3R_256()) {
     jj_scanpos = xsp;
-    if (jj_scan_token(37)) return true;
-    }
+    if (jj_3R_257()) return true;
     }
     }
-    }
-    return false;
-  }
-
-  private boolean jj_3R_307()
- {
-    if (jj_scan_token(DIMEN)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_306()
- {
-    if (jj_scan_token(SPL)) return true;
     return false;
   }
 
-  private boolean jj_3R_305()
+  private boolean jj_3R_312()
  {
     if (jj_scan_token(ST)) return true;
     return false;
   }
 
-  private boolean jj_3R_304()
+  private boolean jj_3R_311()
  {
     if (jj_scan_token(RESOLUTION)) return true;
     return false;
   }
 
-  private boolean jj_3R_303()
+  private boolean jj_3R_310()
  {
     if (jj_scan_token(FREQ)) return true;
     return false;
   }
 
-  private boolean jj_3R_302()
+  private boolean jj_3R_309()
  {
     if (jj_scan_token(TIME)) return true;
     return false;
   }
 
-  private boolean jj_3R_301()
+  private boolean jj_3R_308()
  {
     if (jj_scan_token(ANGLE)) return true;
     return false;
   }
 
-  private boolean jj_3R_300()
+  private boolean jj_3R_307()
  {
     if (jj_scan_token(FLEX)) return true;
     return false;
   }
 
-  private boolean jj_3R_299()
+  private boolean jj_3R_306()
  {
     if (jj_scan_token(ABSOLUTLENGTH)) return true;
     return false;
   }
 
-  private boolean jj_3R_298()
+  private boolean jj_3R_305()
  {
     if (jj_scan_token(RELVIEWLENGTH)) return true;
     return false;
   }
 
-  private boolean jj_3R_297()
+  private boolean jj_3R_304()
  {
     if (jj_scan_token(RELFONTLENGTH)) return true;
     return false;
   }
 
-  private boolean jj_3R_296()
+  private boolean jj_3R_303()
  {
     if (jj_scan_token(PERCENTAGE)) return true;
     return false;
   }
 
-  private boolean jj_3R_295()
+  private boolean jj_3R_302()
  {
     if (jj_scan_token(NUMBER)) return true;
     return false;
   }
 
-  private boolean jj_3_24()
+  private boolean jj_3_21()
  {
-    if (jj_3R_232()) return true;
-    if (jj_3R_235()) return true;
+    if (jj_3R_239()) return true;
+    if (jj_3R_242()) return true;
     return false;
   }
 
-  private boolean jj_3R_294()
+  private boolean jj_3R_301()
  {
-    if (jj_3R_247()) return true;
+    if (jj_3R_254()) return true;
     return false;
   }
 
-  private boolean jj_3R_263()
+  private boolean jj_3R_238()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_294()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_295()) {
-    jj_scanpos = xsp;
-    if (jj_3R_296()) {
-    jj_scanpos = xsp;
-    if (jj_3R_297()) {
-    jj_scanpos = xsp;
-    if (jj_3R_298()) {
+    if (jj_scan_token(41)) {
     jj_scanpos = xsp;
-    if (jj_3R_299()) {
+    if (jj_scan_token(35)) {
     jj_scanpos = xsp;
-    if (jj_3R_300()) {
+    if (jj_scan_token(36)) {
     jj_scanpos = xsp;
-    if (jj_3R_301()) {
+    if (jj_scan_token(38)) {
     jj_scanpos = xsp;
+    if (jj_scan_token(37)) return true;
+    }
+    }
+    }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_268()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_301()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
     if (jj_3R_302()) {
     jj_scanpos = xsp;
     if (jj_3R_303()) {
@@ -11337,7 +11865,21 @@ private boolean jj_3R_263()
     jj_scanpos = xsp;
     if (jj_3R_309()) {
     jj_scanpos = xsp;
-    if (jj_3R_310()) return true;
+    if (jj_3R_310()) {
+    jj_scanpos = xsp;
+    if (jj_3R_311()) {
+    jj_scanpos = xsp;
+    if (jj_3R_312()) {
+    jj_scanpos = xsp;
+    if (jj_3R_313()) {
+    jj_scanpos = xsp;
+    if (jj_3R_314()) {
+    jj_scanpos = xsp;
+    if (jj_3R_315()) {
+    jj_scanpos = xsp;
+    if (jj_3R_316()) {
+    jj_scanpos = xsp;
+    if (jj_3R_317()) return true;
     }
     }
     }
@@ -11356,35 +11898,35 @@ private boolean jj_3R_263()
     return false;
   }
 
-  private boolean jj_3R_233()
+  private boolean jj_3R_240()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_263()) {
+    if (jj_3R_268()) {
     jj_scanpos = xsp;
-    if (jj_3R_264()) return true;
+    if (jj_3R_269()) return true;
     }
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3_25()) { jj_scanpos = xsp; break; }
+      if (jj_3_22()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  private boolean jj_3R_234()
+  private boolean jj_3R_241()
  {
-    if (jj_3R_235()) return true;
+    if (jj_3R_242()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3_24()) { jj_scanpos = xsp; break; }
+      if (jj_3_21()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  private boolean jj_3_23()
+  private boolean jj_3_20()
  {
-    if (jj_3R_231()) return true;
+    if (jj_3R_238()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
@@ -11397,9 +11939,9 @@ private boolean jj_3_23()
     jj_scanpos = xsp;
     if (jj_scan_token(50)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(151)) {
+    if (jj_scan_token(152)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(153)) return true;
+    if (jj_scan_token(154)) return true;
     }
     }
     }
@@ -11408,19 +11950,19 @@ private boolean jj_3_23()
       xsp = jj_scanpos;
       if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
     }
-    if (jj_3R_234()) return true;
+    if (jj_3R_241()) return true;
     return false;
   }
 
-  private boolean jj_3R_223()
+  private boolean jj_3R_229()
  {
-    if (jj_3R_248()) return true;
+    if (jj_3R_255()) return true;
     return false;
   }
 
-  private boolean jj_3R_244()
+  private boolean jj_3R_251()
  {
-    if (jj_3R_234()) return true;
+    if (jj_3R_241()) return true;
     Token xsp;
     xsp = jj_scanpos;
     if (jj_scan_token(30)) {
@@ -11429,9 +11971,9 @@ private boolean jj_3R_244()
     jj_scanpos = xsp;
     if (jj_scan_token(50)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(151)) {
+    if (jj_scan_token(152)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(153)) return true;
+    if (jj_scan_token(154)) return true;
     }
     }
     }
@@ -11440,26 +11982,17 @@ private boolean jj_3R_244()
       xsp = jj_scanpos;
       if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
     }
-    if (jj_3R_231()) return true;
+    if (jj_3R_238()) return true;
     while (true) {
       xsp = jj_scanpos;
       if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
     }
     xsp = jj_scanpos;
-    if (jj_3R_275()) jj_scanpos = xsp;
-    return false;
-  }
-
-  private boolean jj_3_10()
- {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_223()) jj_scanpos = xsp;
-    if (jj_3R_224()) return true;
+    if (jj_3R_281()) jj_scanpos = xsp;
     return false;
   }
 
-  private boolean jj_3R_217()
+  private boolean jj_3R_223()
  {
     if (jj_scan_token(LPAREN)) return true;
     Token xsp;
@@ -11468,24 +12001,49 @@ private boolean jj_3R_217()
       if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
     }
     xsp = jj_scanpos;
-    if (jj_3_23()) {
+    if (jj_3_20()) {
     jj_scanpos = xsp;
-    if (jj_3R_244()) return true;
+    if (jj_3R_251()) return true;
     }
     if (jj_scan_token(RPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3_22()
+  private boolean jj_3_10()
  {
-    if (jj_3R_232()) return true;
-    if (jj_3R_233()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_229()) jj_scanpos = xsp;
+    if (jj_3R_230()) return true;
     return false;
   }
 
-  private boolean jj_3R_417()
+  private boolean jj_3_19()
  {
-    if (jj_3R_224()) return true;
+    if (jj_3R_239()) return true;
+    if (jj_3R_240()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_435()
+ {
+    if (jj_3R_230()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3_10()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_279()
+ {
+    if (jj_3R_240()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3_19()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
@@ -11500,7 +12058,7 @@ private boolean jj_3R_417()
   private Token jj_scanpos, jj_lastpos;
   private int jj_la;
   private int jj_gen;
-  final private int[] jj_la1 = new int[317];
+  final private int[] jj_la1 = new int[334];
   static private int[] jj_la1_0;
   static private int[] jj_la1_1;
   static private int[] jj_la1_2;
@@ -11514,21 +12072,21 @@ private boolean jj_3R_417()
       jj_la1_init_4();
    }
    private static void jj_la1_init_0() {
-      jj_la1_0 = new int[] {0x0,0x0,0x0,0x1a00000,0x1a00000,0x0,0x0,0x0,0x200000,0x200000,0x0,0x0,0x1800000,0x1800000,0x200000,0x200000,0x200000,0x0,0x0,0x200000,0x200000,0x200000,0x0,0x200000,0x0,0x200000,0x200000,0x0,0x200000,0x0,0x0,0x200000,0x200000,0x200000,0x0,0x200000,0x0,0x200000,0x0,0x200000,0x200000,0x0,0x0,0x200000,0x200000,0x0,0x200000,0x0,0x0,0x0,0x0,0x200000,0x0,0x200000,0x0,0x200000,0x200000,0x0,0x200000,0x200000,0x200000,0x0,0x200000,0x200000,0x200000,0x0,0x0,0x200000,0x200000,0x200000,0x0,0x200000,0x0,0x0,0x0,0x0,0x200000,0x50000000,0x200000,0x0,0x200000,0x0,0x200000,0x200000,0x200000,0x200000,0x0,0x200000,0x200000,0x0,0x0,0x200000,0x200000,0x200000,0x0,0x0,0x0,0x200000,0x0,0x200000,0x0,0x0,0x0,0x200000,0x30000000,0x30000000,0x30000000,0x200000,0x200000,0x200000,0x200000,0x30000000,0x0,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x0,0x50000000,0x200000,0x200000,0x50200000,0x30000000,0x200000,0x200000,0x30000000,0x30000000,0x30000000,0x200000,0x200000,0x30000000,0x30000000,0x200000,0x0,0x30000000,0x50000000,0x50000000,0x50000000,0x200000,0x0,0x200000,0x50000000,0x0,0x200000,0x0,0x200000,0x200000,0x50000000,0x0,0x200000,0x50000000,0x200000,0x200000,0x200000,0x0,0x0,0x0,0x0,0x0,0x0,0x50200000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x200000,0x0,0x0,0x200000,0x6000000,0x200000,0x0,0x200000,0x200000,0x6000000,0x200000,0x200000,0x0,0x0,0x0,0x200000,0x0,0x200000,0x200000,0x200000,0x200000,0x200000,0x0,0x200000,0x200000,0x0,0x200000,0x200000,0x200000,0x200000,0x0,0x30000000,0x0,0x200000,0x200000,0x30000000,0x200000,0x0,0x0,0x0,0x200000,0x0,0x0,0x200000,0x0,0x200000,0x30000000,0x200000,0x30000000,0x200000,0x200000,0xc0000000,0x200000,0xc0000000,0x200000,0x200000,0xc0000000,0x200000,0xc0000000,0x30000000,0x200000,0x30000000,0x0,0x0,0x0,0x30000000,0x30000000,0x0,0x0,0x0,0x200000,0x0,0x200000,0x30000000,0x200000,0x200000,0x0,0x200000,0x200000,0x200000,0x200000,0x0,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x30200000,0x200000,0x200000,0x200000,0x200000,0x30000000,0x0,0x30000000,0x200000,0x200000,0x30000000,0x200000,0x30200000,0x200000,0x200000,0x0,0x200000,0x30000000,0x0,0x200000,0x200000,0x30000000,0x200000,0x200000,0x0,0x200000,0x0,0x200000,0x0,0x200000,0x0,0x200000,0x200000,0x200000,0x0,0x0,};
+      jj_la1_0 = new int[] {0x0,0x0,0x0,0x1a00000,0x1a00000,0x0,0x0,0x0,0x200000,0x200000,0x0,0x0,0x1800000,0x1800000,0x200000,0x200000,0x200000,0x0,0x0,0x200000,0x200000,0x200000,0x0,0x200000,0x0,0x200000,0x200000,0x0,0x200000,0x0,0x0,0x200000,0x200000,0x200000,0x0,0x200000,0x0,0x200000,0x0,0x200000,0x200000,0x0,0x0,0x200000,0x200000,0x0,0x200000,0x0,0x0,0x0,0x0,0x200000,0x0,0x200000,0x0,0x200000,0x200000,0x0,0x200000,0x200000,0x200000,0x0,0x200000,0x200000,0x200000,0x0,0x0,0x200000,0x200000,0x200000,0x0,0x200000,0x0,0x0,0x0,0x0,0x200000,0x50000000,0x200000,0x0,0x200000,0x0,0x200000,0x200000,0x200000,0x200000,0x0,0x200000,0x200000,0x0,0x0,0x200000,0x200000,0x200000,0x0,0x0,0x0,0x200000,0x0,0x200000,0x0,0x0,0x0,0x200000,0x30000000,0x30000000,0x30000000,0x200000,0x200000,0x200000,0x200000,0x30000000,0x0,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x0,0x50000000,0x200000,0x200000,0x50200000,0x30000000,0x200000,0x200000,0x30000000,0x30000000,0x30000000,0x200000,0x200000,0x30000000,0x30000000,0x200000,0x0,0x30000000,0x50000000,0x50000000,0x50000000,0x200000,0x0,0x200000,0x50000000,0x0,0x200000,0x0,0x200000,0x200000,0x50000000,0x0,0x200000,0x50000000,0x200000,0x50200000,0x200000,0x200000,0x0,0x0,0x0,0x0,0x0,0x0,0x50200000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x200000,0x0,0x0,0x200000,0x6000000,0x200000,0x0,0x200000,0x200000,0x6000000,0x200000,0x200000,0x0,0x0,0x0,0x200000,0x0,0x200000,0x200000,0x200000,0x200000,0x200000,0x0,0x200000,0x200000,0x0,0x200000,0x200000,0x200000,0x200000,0x0,0x30000000,0x0,0x200000,0x200000,0x30000000,0x200000,0x0,0x0,0x0,0x200000,0x0,0x0,0x200000,0x30000000,0x0,0x200000,0x30000000,0x200000,0x30000000,0x200000,0x200000,0xc0000000,0x200000,0xc0000000,0x200000,0x200000,0xc0000000,0x200000,0xc0000000,0x30000000,0x200000,0x30000000,0x0,0x0,0x0,0x30000000,0x30000000,0x0,0x0,0x0,0x200000,0x0,0x200000,0x30000000,0x0,0x200000,0x200000,0x0,0x200000,0x200000,0x200000,0x30000000,0x200000,0x0,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x0,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x30200000,0x200000,0x200000,0x200000,0x200000,0x30000000,0x0,0x30000000,0x0,0x200000,0x200000,0x30000000,0x200000,0x30200000,0x200000,0x200000,0x0,0x200000,0x30000000,0x0,0x0,0x200000,0x200000,0x30000000,0x200000,0x200000,0x0,0x200000,0x0,0x200000,0x0,0x200000,0x0,0x200000,0x200000,0x200000,0x30000000,0x0,0x0,};
    }
    private static void jj_la1_init_1() {
-      jj_la1_1 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x278,0x0,0x0,0x0,0xe8a00e78,0x0,0x0,0x0,0x0,0x0,0x278,0x10000080,0x0,0x0,0x0,0x10000080,0x0,0x4000260,0x0,0x0,0x4000260,0x0,0xe8a00e78,0xe8a00e78,0x0,0x0,0x0,0x1,0x0,0x60,0x0,0x60,0x0,0x0,0x8,0x260,0x0,0x0,0x8,0x0,0x10,0x18,0x18,0x4000040,0x0,0x8,0x0,0x4000040,0x0,0x0,0x4000000,0x0,0x0,0x0,0x8000000,0x0,0x0,0x0,0xe8a00e78,0xe8a00e78,0x0,0x0,0x0,0x8,0x0,0x10,0x18,0x18,0x4000040,0x0,0xef4267b,0x0,0x4000000,0x0,0x278,0x0,0x0,0x0,0x0,0x8000278,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8000000,0x8000000,0x8000278,0x0,0x1,0x0,0x8000000,0x8000000,0x8000278,0x0,0x0,0x0,0x278,0x0,0x0,0x0,0x0,0x278,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x6,0x0,0x0,0x6,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x278,0x0,0xef40003,0xef40003,0xef4227b,0x0,0x400,0x0,0xef4267b,0x1,0x0,0x1,0x0,0x0,0xef4267b,0x80000,0x0,0xef4267b,0x0,0x0,0x0,0xe8200c00,0xe8200c00,0xe8200c00,0xe8200c00,0xe8a00e78,0xe8200c00,0x6,0x800278,0x800278,0xe0000000,0xe0000000,0x800278,0x800278,0x800278,0x0,0x800278,0x800278,0x0,0x78000,0x0,0x2f8,0x0,0x0,0x78000,0x0,0x0,0x278,0x8000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x278,0x278,0x0,0x0,0x0,0x278,0x0,0x0,0x278,0xc00,0x0,0x0,0x8000000,0x0,0x0,0x0,0x2f8,0x0,0x2f8,0x0,0x0,0x40000,0x0,0x40000,0x0,0x0,0x40000,0x0,0x40000,0xf0000ef8,0x0,0x0,0xe0001000,0x600000,0x10700ef8,0xf0701ef8,0x0,0x0,0x0,0xe0000000,0x0,0x10000ef8,0x0,0xf0000ef8,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000000,0x900000,0x0,0x0,0x0,0x4000000,0x0,0x0,0x0,0x0,0x900000,0x0,0x0,0xe0000000,0x0,0x0,0xe4000000,0x0,0x0,0x278,0x0,0x278,0x0,0x1,0x0,0x1,0x0,0x0,0x0,0x278,0xc00,};
+      jj_la1_1 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x278,0x0,0x0,0x0,0xe9a00e78,0x0,0x0,0x0,0x0,0x0,0x278,0x10000080,0x0,0x0,0x0,0x10000080,0x0,0x4000260,0x0,0x0,0x4000260,0x0,0xe9a00e78,0xe9a00e78,0x0,0x0,0x0,0x1,0x0,0x60,0x0,0x60,0x0,0x0,0x8,0x260,0x0,0x0,0x8,0x0,0x10,0x18,0x18,0x4000040,0x0,0x8,0x0,0x4000040,0x0,0x0,0x4000000,0x0,0x0,0x0,0x8000000,0x0,0x0,0x0,0xe9a00e78,0xe9a00e78,0x0,0x0,0x0,0x8,0x0,0x10,0x18,0x18,0x4000040,0x0,0xff4267b,0x0,0x4000000,0x0,0x278,0x0,0x0,0x0,0x0,0x8000278,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8000000,0x8000000,0x8000278,0x0,0x1,0x0,0x8000000,0x8000000,0x8000278,0x0,0x0,0x0,0x278,0x0,0x0,0x0,0x0,0x278,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x6,0x0,0x0,0x6,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x278,0x0,0xef40003,0xef40003,0xef4227b,0x0,0x1000400,0x0,0xff4267b,0x1,0x0,0x1,0x0,0x0,0xff4267b,0x80000,0x0,0xff4267b,0x0,0x6,0x0,0x0,0xe9200c00,0xe9200c00,0xe9200c00,0xe9200c00,0xe9a00e78,0xe9200c00,0x6,0x800278,0xe9200c00,0x0,0x8000000,0x800278,0xe1000000,0xe0000000,0x800278,0x800278,0x800278,0x0,0x800278,0x800278,0x0,0x78000,0x0,0x2f8,0x0,0x0,0x78000,0x0,0x0,0x278,0x8000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x278,0x278,0x0,0x0,0x0,0x278,0x0,0x0,0x278,0xc00,0x0,0x0,0x8000000,0x0,0xf0701ef8,0x0,0x0,0x2f8,0x0,0x2f8,0x0,0x0,0x40000,0x0,0x40000,0x0,0x0,0x40000,0x0,0x40000,0xf0000ef8,0x0,0x0,0xe0001000,0x600000,0x10700ef8,0xf0701ef8,0x0,0x0,0x0,0xe0000000,0x0,0x10000ef8,0x0,0xf0000ef8,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0xe4000200,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000200,0x900000,0x0,0x200,0x0,0x0,0x4000200,0x0,0x0,0x0,0x0,0x900000,0x0,0x0,0x200,0xe0000200,0x0,0x0,0xe4000200,0x0,0x0,0x278,0x0,0x278,0x0,0x1,0x0,0x1,0x0,0x0,0x0,0xf0701ef8,0x278,0xc00,};
    }
    private static void jj_la1_init_2() {
-      jj_la1_2 = new int[] {0x0,0x0,0x8000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10000,0x14272,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x14272,0x14272,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x14272,0x14272,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfffe0000,0xfffe0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x400,0x0,0x0,0x0,0x0,0x400,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x200,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4272,0x4272,0x4272,0x4272,0x4272,0x272,0x0,0x0,0x4000,0x272,0x272,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xa80,0x0,0x0,0x0,0xa80,0x0,0x0,0x0,0x0,0x0,0x1000,0x0,0x0,0x1000,0x0,0xe00,0x0,0xe00,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2f7f,0x0,0x0,0x2f7f,0x0,0x0,0x2f7f,0x0,0x800,0x0,0x2f7f,0x0,0x0,0x0,0x2f7f,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x0,0x0,0x0,0x0,0x800,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc33,0x0,0x0,0xc33,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
+      jj_la1_2 = new int[] {0x0,0x0,0x8000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10000,0x14272,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x14272,0x14272,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x14272,0x14272,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfffe0000,0xfffe0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x400,0x0,0x0,0x0,0x0,0x400,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x200,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4272,0x4272,0x4272,0x4272,0x4272,0x272,0x0,0x0,0x272,0x4000,0x0,0x4000,0x272,0x272,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xa80,0x0,0x0,0x0,0xa80,0x0,0x0,0x0,0x0,0x0,0x1000,0x0,0x0,0x2f7f,0x1000,0x0,0xe00,0x0,0xe00,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2f7f,0x0,0x0,0x2f7f,0x0,0x0,0x2f7f,0x0,0x800,0x0,0x2f7f,0x0,0x0,0x0,0x2f7f,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc33,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x0,0x0,0x800,0x0,0x0,0x800,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0xc33,0x0,0x0,0xc33,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2f7f,0x0,0x0,};
    }
    private static void jj_la1_init_3() {
-      jj_la1_3 = new int[] {0x0,0x0,0x0,0x0,0x0,0x2,0x4,0x0,0x0,0x0,0x3ef8,0x1003ef8,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1003ef8,0x1003ef8,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1003ef8,0x1003ef8,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1002000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1002000,0x0,0x1002000,0x0,0x0,0x0,0x0,0x0,0x1002000,0x0,0x0,0x1002000,0x0,0x0,0x0,0x1000000,0x1000000,0x1000000,0x1000000,0x1000000,0x1000000,0x0,0x0,0x0,0x1000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000000,0x0,0x6000000,0x0,0x8000000,0x0,0x0,0x0,0x0,0x0,0x80000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xbe000000,0xbe000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800000,0x0,0x0,0x0,0x0,0x800000,0x800000,0x0,0x0,0x0,0x0,0x0,0x800000,0x0,0x800000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
+      jj_la1_3 = new int[] {0x0,0x0,0x0,0x0,0x0,0x2,0x4,0x0,0x0,0x0,0x3ef8,0x3ef8,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3ef8,0x3ef8,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3ef8,0x3ef8,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2000,0x0,0x2000,0x0,0x0,0x0,0x0,0x0,0x2000,0x0,0x0,0x2000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000000,0x0,0x3000000,0x0,0x4000000,0x0,0x0,0x0,0x0,0x0,0xc0000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xdf000000,0xdf000000,0x0,0x0,0x0,0x0,0x0,0x800000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800000,0x0,0x0,0x0,0x0,0x800000,0x800000,0x0,0x0,0x0,0x0,0x0,0x800000,0x0,0x800000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800000,0x0,0x0,};
    }
    private static void jj_la1_init_4() {
-      jj_la1_4 = new int[] {0x18000,0x18000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000000,0x1000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000000,0x1000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1fe0000,0x0,0x4000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1fe0000,0x1fe0000,0x1fe0000,0x0,0x0,0x0,0x1fe0000,0x0,0x0,0x0,0x0,0x0,0x1fe0000,0x0,0x0,0x1fe0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000000,0x0,0x0,0x1000000,0x1000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x66,0x0,0x0,0x0,0x0,0x0,0x0,0x18,0x0,0x0,0x0,0x0,0x40ff,0x40ff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2800000,0x0,0x2800000,0x0,0x0,0x2800000,0x0,0x2800000,0x4f00,0x0,0x0,0x0,0x0,0x7f00,0x7f00,0x0,0x0,0x4f00,0x4f00,0x0,0x0,0x0,0x4f00,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3f00,0x0,0x0,0x80000,0x0,0x80000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
+      jj_la1_4 = new int[] {0x30000,0x30000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2000000,0x2000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2000000,0x2000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3fc0000,0x0,0x8000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3fc0000,0x3fc0000,0x3fc0000,0x0,0x0,0x0,0x3fc0000,0x0,0x0,0x0,0x0,0x0,0x3fc0000,0x0,0x0,0x3fc0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2000000,0x0,0x0,0x2000000,0x0,0x0,0x0,0x2000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x33,0x0,0x0,0x0,0x0,0x0,0x0,0xc,0x0,0x0,0x0,0x0,0x807f,0x807f,0x0,0x0,0x0,0x0,0x0,0xff80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x5000000,0x0,0x5000000,0x0,0x0,0x5000000,0x0,0x5000000,0x9f80,0x0,0x0,0x0,0x0,0xff80,0xff80,0x0,0x0,0x9f80,0x9f80,0x0,0x0,0x0,0x9f80,0xf00,0x0,0x0,0x0,0x0,0x0,0x0,0x7f80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7f80,0x0,0x0,0x100000,0x0,0x100000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xff80,0x0,0x0,};
    }
-  final private JJCalls[] jj_2_rtns = new JJCalls[31];
+  final private JJCalls[] jj_2_rtns = new JJCalls[29];
   private boolean jj_rescan = false;
   private int jj_gc = 0;
 
@@ -11543,7 +12101,7 @@ public CssParser(java.io.InputStream stream, String encoding) {
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 317; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 334; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -11558,7 +12116,7 @@ public void ReInit(java.io.InputStream stream, String encoding) {
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 317; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 334; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -11569,7 +12127,7 @@ public CssParser(java.io.Reader stream) {
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 317; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 334; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -11580,7 +12138,7 @@ public void ReInit(java.io.Reader stream) {
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 317; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 334; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -11590,7 +12148,7 @@ public CssParser(CssParserTokenManager tm) {
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 317; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 334; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -11600,7 +12158,7 @@ public void ReInit(CssParserTokenManager tm) {
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 317; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 334; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -11713,12 +12271,12 @@ private void jj_add_error_token(int kind, int pos) {
   /** Generate ParseException. */
   public ParseException generateParseException() {
     jj_expentries.clear();
-    boolean[] la1tokens = new boolean[154];
+    boolean[] la1tokens = new boolean[155];
     if (jj_kind >= 0) {
       la1tokens[jj_kind] = true;
       jj_kind = -1;
     }
-    for (int i = 0; i < 317; i++) {
+    for (int i = 0; i < 334; i++) {
       if (jj_la1[i] == jj_gen) {
         for (int j = 0; j < 32; j++) {
           if ((jj_la1_0[i] & (1<< 154; i++) {
+    for (int i = 0; i < 155; i++) {
       if (la1tokens[i]) {
         jj_expentry = new int[1];
         jj_expentry[0] = i;
@@ -11766,7 +12324,7 @@ final public void disable_tracing() {
 
   private void jj_rescan_token() {
     jj_rescan = true;
-    for (int i = 0; i < 31; i++) {
+    for (int i = 0; i < 29; i++) {
     try {
       JJCalls p = jj_2_rtns[i];
       do {
@@ -11802,8 +12360,6 @@ private void jj_rescan_token() {
             case 26: jj_3_27(); break;
             case 27: jj_3_28(); break;
             case 28: jj_3_29(); break;
-            case 29: jj_3_30(); break;
-            case 30: jj_3_31(); break;
           }
         }
         p = p.next;
diff --git a/org/w3c/css/parser/analyzer/CssParser.jj b/org/w3c/css/parser/analyzer/CssParser.jj
index 33fb0ccb2..33dfa8f64 100644
--- a/org/w3c/css/parser/analyzer/CssParser.jj
+++ b/org/w3c/css/parser/analyzer/CssParser.jj
@@ -65,7 +65,6 @@ import org.w3c.css.values.CssAttr;
 import org.w3c.css.values.CssBracket;
 import org.w3c.css.values.CssCalc;
 import org.w3c.css.values.CssCheckableValue;
-import org.w3c.css.values.CssClamp;
 import org.w3c.css.values.CssColor;
 import org.w3c.css.values.CssComparator;
 import org.w3c.css.values.CssExpression;
@@ -76,8 +75,7 @@ import org.w3c.css.values.CssHashIdent;
 import org.w3c.css.values.CssIdent;
 import org.w3c.css.values.CssImage;
 import org.w3c.css.values.CssLength;
-import org.w3c.css.values.CssMax;
-import org.w3c.css.values.CssMin;
+import org.w3c.css.values.CssMathFunction;
 import org.w3c.css.values.CssNumber;
 import org.w3c.css.values.CssOperator;
 import org.w3c.css.values.CssPercentage;
@@ -647,20 +645,18 @@ TOKEN [IGNORE_CASE] :
 
 TOKEN [IGNORE_CASE] :
 {
-  < RELFONTLENGTH  :  "em"
-                   |  "ex"
-	           |  "cap"
-                   |  "ch"
-	           |  "ic"
-	           |  "lh"
-	           |  "rlh"
-                   |  "rem" >
-  |  "vw"
-                   |  "vh"
-	           |  "vi"
-	           |  "vb"
-                   |  "vmin"
-                   |  "vmax" >
+  < RELFONTLENGTH  :  ( "r" )? "em"
+                   |  ( "r" )? "ex"
+	           |  ( "r" )? "cap"
+                   |  ( "r" )? "ch"
+	           |  ( "r" )? "ic"
+	           |  ( "r" )? "lh" >
+  |  ( "s" | "l" | "d" )? "vw"
+                   |  ( "s" | "l" | "d" )? "vh"
+	           |  ( "s" | "l" | "d" )? "vi"
+	           |  ( "s" | "l" | "d" )? "vb"
+                   |  ( "s" | "l" | "d" )? "vmin"
+                   |  ( "s" | "l" | "d" )? "vmax" >
   |  "cm"
                    |  "mm"
                    |  "q"
@@ -758,12 +754,6 @@ TOKEN [IGNORE_CASE] :
   | < UNICODERANGE : "U+"  | "U+"  "-"  >
 }
 
-
-    TOKEN:
-{
-    < CLASS : "."  >
-}
-
 /* FIXED, added a special case for lang pseudoclass */
 
 TOKEN [IGNORE_CASE] :
@@ -784,8 +774,10 @@ TOKEN [IGNORE_CASE] :
     | 
     | 
     | 
-    | 
-    | 
+    | 
+    | 
+    | 
+    | 
     | 
     | 
     | 
@@ -1201,6 +1193,10 @@ void mediaexpression(AtRuleMedia mediaRule, boolean defaultMedia, String comb) :
             mediaRule.addMediaFeature(mf, ac);
 	    mf.setCombinator(comb);
 	    // mf.setParens();
+        } else {
+            if (defaultMedia) {
+                mediaRule.removeLastMedia();
+            }
         }
     }
 }
@@ -1997,7 +1993,7 @@ String property() :
                 }
                 return currentProperty;
                }
-  | ( n= | n= | n= ) {
+  | ( n= | (  n=ident() ) | n= ) {
          if (ac.getTreatCssHacksAsWarnings()) {
                               ac.getFrame().addWarning("css-hack", n.image);
                               // should we continue and validate the content, or skip ?
@@ -2066,6 +2062,9 @@ void ruleSet() :
 
 	 {
 	    validSelector = (context_set.size() > 0);
+            if (validSelector) {
+                currentContext = context_set;
+            }
 	}
 	(  )*
 	    value_set=declarations()
@@ -2208,11 +2207,11 @@ ArrayList attributeDeclarations() :
 
 CssSelectors relative_selector() :
 {
-	String comb;
+	String comb = "*none*";
 	CssSelectors current;
 } 
 {
-	comb=combinator() {
+	( comb=combinator() )? {
 		current = new CssSelectors(ac);
 		               switch(comb) {
                         case "+":
@@ -2227,6 +2226,8 @@ CssSelectors relative_selector() :
                         case "||":
                                 current.addColumnCombinator();
                                 break;
+			case "*none*":
+				break;
                         default:
                                 current.addDescendantCombinator();
                 }                  
@@ -2291,7 +2292,7 @@ CssSelectors subclass_selector(CssSelectors selector) :
 
 CssSelectors complex_selector(CssSelectors sel) :
 {
-	String comb;
+	String comb = "*none*";
 	CssSelectors current;
 }
 {
@@ -2328,6 +2329,8 @@ CssSelectors complex_selector(CssSelectors sel) :
 				case "||":
 					current.addColumnCombinator();
 					break;
+				case "*none*":
+					break;
 				default:
 					current.addDescendantCombinator();
 			}
@@ -2381,7 +2384,7 @@ CssSelectors compound_selector(CssSelectors next) :
         selector.setAtRule(getAtRule());
 }
 {
-	( LOOKAHEAD(3) ( ( ( type_selector(selector) )?  ( LOOKAHEAD(2) subclass_selector(selector) )+ ) ( LOOKAHEAD(2) pseudo_element_selector(selector) ( LOOKAHEAD(2) pseudo_class_selector(selector) )* )* )
+	( LOOKAHEAD(4) ( ( ( type_selector(selector) )?  ( LOOKAHEAD(1) subclass_selector(selector) )+ ) ( LOOKAHEAD(1) pseudo_element_selector(selector) ( LOOKAHEAD(1) pseudo_class_selector(selector) )* )* )
 	| ( type_selector(selector) ( LOOKAHEAD(2) pseudo_element_selector(selector) ( LOOKAHEAD(2) pseudo_class_selector(selector) )* )* )
 	| ( ( LOOKAHEAD(2) pseudo_element_selector(selector) ( LOOKAHEAD(2) pseudo_class_selector(selector) )* )+ ) ) {
 		return selector;
@@ -2394,12 +2397,9 @@ CssSelectors compound_selector(CssSelectors next) :
 void class_selector(CssSelectors s) :
 {Token n; }
 {
-    /*  "." n= { */
-    n= {
+    (  n=ident() ) {
 	try {
-	    s.addClass(new ClassSelector(convertClassIdent(n.image.substring(1))));
-	    //        s.addAttribute("class", convertIdent(n.image.substring(1)),
-	    //           CssSelectors.ATTRIBUTE_CLASS_SEL);
+	    s.addClass(new ClassSelector(convertClassIdent(n.image)));
 	} catch (InvalidParamException e) {
 	    //	    removeThisRule();
 	     ac.getFrame()
@@ -2960,13 +2960,13 @@ try {
  */
 CssProperty declaration() :
 { String string_property;
-  CssExpression values;
+  CssExpression values = null;
   boolean important = false;
 }
 {
 try {
      string_property=property()  (  )* 
-      values=expr() ( important=prio() )?
+      ( values=expr() )? ( important=prio() )?
     {
 	try {
             if (string_property == null) {
@@ -2977,20 +2977,27 @@ try {
 	    if (incompatible_error) {
 		throw new InvalidParamException("notforcss1", "inherit", ac);
 	    }
-
-	    if (values.getCount() != 0) {
+	    if (values == null) {
+                if (string_property.startsWith("--")) {
+			values = new CssExpression();
+		} else {
+			// old behaviour for empty properties
+			throw new ParseException();
+		}
+	    }
+	    if (values.getCount() != 0 || string_property.startsWith("--")) {
 		CssProperty p = handleDeclaration(string_property.toLowerCase(),
 						  values, important);
 		// Did the property recognize all values in the expression ?
 
 		if (!values.end() && ac.getMedium() == null) {
-		        addError(new InvalidParamException("unrecognize", "", ac),
+		   addError(new InvalidParamException("unrecognize", "", ac),
 			     values);
 		} else {
-		    // ok, return the new property
-		    return p;
+                    // ok, return the new property
+                    return p;
 		}
-	    }
+            }
 	} catch (InvalidParamException e) {
             incompatible_error = false;
             if (e instanceof WarningParamException) {
@@ -3180,8 +3187,7 @@ void term(CssExpression exp) :
         ) 
       )
       | ( func=mathcalc() { setValue(func, exp, operator, null, FUNCTIONCALC); }
-        | func=mathmax() { setValue(func, exp, operator, null, FUNCTION); }
-        | func=mathmin() { setValue(func, exp, operator, null, FUNCTION); }
+        | func=mathfunction() { setValue(func, exp, operator, null, FUNCTION); }
         | func=mathclamp() { setValue(func, exp, operator, null, FUNCTION); } 
         | func=attr() { setValue(func, exp, operator, null, FUNCTION); }
         | func=functionvar() { setValue(func, exp, operator, null, FUNCTIONVAR); }
@@ -3274,8 +3280,7 @@ void mediaterm(CssExpression exp) :
     }
    | (  func=function() { setValue(func, exp, operator, null, FUNCTION); }
       | func=mathcalc() { setValue(func, exp, operator, null, FUNCTIONCALC); }
-      | func=mathmax() { setValue(func, exp, operator, null, FUNCTION); }
-      | func=mathmin() { setValue(func, exp, operator, null, FUNCTION); }
+      | func=mathfunction() { setValue(func, exp, operator, null, FUNCTION); }
       | func=mathclamp() { setValue(func, exp, operator, null, FUNCTION); }
      ) ) (  )* )
    | (( n= { setValue(new CssString(), exp, operator, n, STRING); }
@@ -3314,60 +3319,103 @@ void mediaterm(CssExpression exp) :
     ) (  )* )
 }
 
-CssCheckableValue mathmin() :
+CssCheckableValue mathfunction() :
+{
+	CssCheckableValue v;
+}
+{
+	( v=mathfunction1() | v=mathfunction2() | v=mathfunctionn() | v=mathfunctionround() ) {
+		return v;
+	}
+}
+
+
+CssCheckableValue mathfunctionn() :
 {
     CssCheckableValue v;
-    CssMin c;
+    CssMathFunction c;
     Token n;
 }
 {
-    ( n=  (  )* v=mathsum() {
-       if (v.getRawType() != CssTypes.CSS_MIN) {
-           c = new CssMin(v);
-        } else {
-           c = (CssMin) v;
-        }
+    ( n=  (  )* v=mathsum() {
+           c = new CssMathFunction(ac, n.image, v);
     }
 	(  )* (  (  )* v=mathsum() {
-		c.addValue(v);
+	        c.addValue(v);
 	} (  )* )*  ) {
 	c.validate();
     return c;
   }
 }
 
-CssCheckableValue mathmax() :
+CssCheckableValue mathfunctionround() :
 {
     CssCheckableValue v;
-    CssMax c;
+    CssMathFunction c;
     Token n;
 }
 {
-    ( n=  (  )* v=mathsum() {
-       if (v.getRawType() != CssTypes.CSS_MAX) {
-           c = new CssMax(v);
-        } else {
-           c = (CssMax) v;
-        }
+    ( n= { c = new CssMathFunction(ac, n.image); }
+        (  )* (  LOOKAHEAD(2) n= { c.addValue(CssIdent.getIdent(convertIdent(n.image))); } 
+     | v=mathsum() { c.addValue(v); } )
+        (  )* (  (  )* v=mathsum() {
+                c.addValue(v);
+        } (  )* )*  ) {
+        c.validate();
+    return c;
+  }
+}
+
+
+CssCheckableValue mathfunction1() :
+{
+    CssCheckableValue v;
+    CssMathFunction c;
+    Token n;
+}
+{
+    ( n=  (  )* v=mathsum() {
+           c = new CssMathFunction(ac, n.image, v);
     }
-	(  )* (  (  )* v=mathsum() {
-	        c.addValue(v);
-	} (  )* )*  ) {
-	c.validate();
+    (  )*  ) {
+        c.validate();
+    return c;
+  }
+}
+
+CssCheckableValue mathfunction2() :
+{
+    CssCheckableValue v;
+    CssMathFunction c;
+    Token n;
+}
+{
+    ( n=  (  )* v=mathsum() {
+           c = new CssMathFunction(ac, n.image, v);
+    }
+        (  )* (  (  )* v=mathsum() {
+                c.addValue(v);
+        } (  )* )?  ) {
+        c.validate();
     return c;
   }
 }
 
+
+
 CssCheckableValue mathclamp() :
 {
     CssCheckableValue v1, v2, v3;
-CssClamp c;
-Token n;
+    CssMathFunction c;
+    Token n;
 }
 {
     ( n=  (  )* v1=mathsum() (  )*  (  )* v2=mathsum() (  )*
        (  )* v3=mathsum() (  )*  ) {
-	c = new CssClamp(ac, v1, v2, v3);
+	c = new CssMathFunction(ac, n.image);
+        c.addValue(v1);
+        c.addValue(v2);
+        c.addValue(v3);
 	c.validate();
 	return c;
     }
@@ -3417,7 +3465,7 @@ CssCheckableValue mathsum() :
 			  nb_pre_sp = 0;
     }
 	// special case for "-" as it can't match like  ( is <_W>* "+")
-	( LOOKAHEAD(2) ( o= | ( (  { nb_pre_sp++; }  )* o= ) ) { 
+	( LOOKAHEAD(2) ( o= | ( (  { nb_pre_sp++; }  )* o= ) ) {
 	    if (o.image.length() < 2 && nb_pre_sp == 0) {
 		throw new ParseException(ac.getMsg().getString("parser.calcwhitespace"));
 	    }
@@ -3488,7 +3536,7 @@ CssCheckableValue calcnumbervalue() :
 }
 {
  (
- ( ( operator=unaryOperator() )? n= { v = new CssNumber(); v.set(addOperator(operator, n.image), ac); } ) |
+ ( ( operator=unaryOperator() )? ( n= | n= ) { v = new CssNumber(); v.set(addOperator(operator, n.image), ac); } ) |
  (  (  )* v=calcnumbersum() (  )*  { try { ((CssCalc) v).setParenthesis(); } catch (Exception ex) { ex.printStackTrace();}} )
  ) {
   return v;
@@ -3557,7 +3605,7 @@ CssCheckableValue v = null;
 char operator = ' ';
 }
 {
-    ( ( operator=unaryOperator() )? ( n= { v = new CssNumber(); v.set(addOperator(operator, n.image), ac); }
+    ( ( operator=unaryOperator() )? ( ( n= | n= ) { v = new CssNumber(); v.set(addOperator(operator, n.image), ac); }
     | n= { v = new CssPercentage(); v.set(addOperator(operator, n.image), ac); }
     | n= { v = new CssLength(); v.set(addOperator(operator, n.image), ac); } 
     | n= { v = new CssLength(); v.set(addOperator(operator, n.image), ac); }
@@ -3569,8 +3617,7 @@ char operator = ' ';
     )
     | (  (  )* v=mathsum() (  )*  ) { ((CssCalc) v).setParenthesis(); }
     | v=mathcalc()
-    | v=mathmax()
-    | v=mathmin()
+    | v=mathfunction()
     | v=mathclamp()
     | v=attr()
     | v=functionvar()
@@ -3644,11 +3691,11 @@ CssCheckableValue functionvar() :
  */
 CssValue function() :
 {Token n,p = null,q = null;
- CssExpression exp;
+ CssExpression exp = new CssExpression();
  CssColor color = new CssColor();
 }
 {
-    n= (  )*  ( LOOKAHEAD(2) exp=expr()
+    n= (  )*  ( LOOKAHEAD(2) ( exp=expr() )?
     ")" { 
 	String funcname = n.image.toLowerCase();
 	if (funcname.equals("rgb(")) {
@@ -3675,6 +3722,14 @@ CssValue function() :
         } else if (funcname.equals("device-cmyk(")) {
             color.setDeviceCMYKColor(ac, exp);
             return color;
+        } else if (funcname.equals("light-dark(")) {
+	    color.setLightDark(ac, exp);
+	    return color;
+/*
+        } else if (funcname.equals("color-mix(")) {
+	    color.setColorMix(ac, exp);
+	    return color;
+*/
 	} else if (funcname.equals("image(")) {
 	    CssImage img = new CssImage();
 	    img.setImageList(exp, ac);
@@ -3878,9 +3933,11 @@ String skip_to_matching_paren() {
 	    case FUNCTIONNTHLASTOFTYPE:
             case FUNCTIONNOT:
             case FUNCTIONCALC:
-            case FUNCTIONMIN:
-            case FUNCTIONMAX:
+            case FUNCTIONMATHN:
+            case FUNCTIONMATH1:
+            case FUNCTIONMATH2:
             case FUNCTIONCLAMP:
+            case FUNCTIONROUND:
             case FUNCTIONATTR:
             case FUNCTIONVAR:
                 s.append(tok.image);
diff --git a/org/w3c/css/parser/analyzer/CssParserConstants.java b/org/w3c/css/parser/analyzer/CssParserConstants.java
index 7dd3c0ae0..ed95c45d9 100644
--- a/org/w3c/css/parser/analyzer/CssParserConstants.java
+++ b/org/w3c/css/parser/analyzer/CssParserConstants.java
@@ -249,55 +249,57 @@ public interface CssParserConstants {
   /** RegularExpression Id. */
   int UNICODERANGE = 119;
   /** RegularExpression Id. */
-  int CLASS = 120;
+  int FUNCTIONLANG = 120;
   /** RegularExpression Id. */
-  int FUNCTIONLANG = 121;
+  int FUNCTIONDIR = 121;
   /** RegularExpression Id. */
-  int FUNCTIONDIR = 122;
+  int FUNCTIONIS = 122;
   /** RegularExpression Id. */
-  int FUNCTIONIS = 123;
+  int FUNCTIONWHERE = 123;
   /** RegularExpression Id. */
-  int FUNCTIONWHERE = 124;
+  int FUNCTIONHAS = 124;
   /** RegularExpression Id. */
-  int FUNCTIONHAS = 125;
+  int FUNCTIONSLOTTED = 125;
   /** RegularExpression Id. */
-  int FUNCTIONSLOTTED = 126;
+  int FUNCTIONHOST = 126;
   /** RegularExpression Id. */
-  int FUNCTIONHOST = 127;
+  int FUNCTIONHOSTCONTEXT = 127;
   /** RegularExpression Id. */
-  int FUNCTIONHOSTCONTEXT = 128;
+  int FUNCTIONNTHCHILD = 128;
   /** RegularExpression Id. */
-  int FUNCTIONNTHCHILD = 129;
+  int FUNCTIONNTHLASTCHILD = 129;
   /** RegularExpression Id. */
-  int FUNCTIONNTHLASTCHILD = 130;
+  int FUNCTIONNTHCOL = 130;
   /** RegularExpression Id. */
-  int FUNCTIONNTHCOL = 131;
+  int FUNCTIONNTHLASTCOL = 131;
   /** RegularExpression Id. */
-  int FUNCTIONNTHLASTCOL = 132;
+  int FUNCTIONNTHOFTYPE = 132;
   /** RegularExpression Id. */
-  int FUNCTIONNTHOFTYPE = 133;
+  int FUNCTIONNTHLASTOFTYPE = 133;
   /** RegularExpression Id. */
-  int FUNCTIONNTHLASTOFTYPE = 134;
+  int FUNCTIONNOT = 134;
   /** RegularExpression Id. */
-  int FUNCTIONNOT = 135;
+  int FUNCTIONCALC = 135;
   /** RegularExpression Id. */
-  int FUNCTIONCALC = 136;
+  int FUNCTIONMATHN = 136;
   /** RegularExpression Id. */
-  int FUNCTIONMIN = 137;
+  int FUNCTIONMATH1 = 137;
   /** RegularExpression Id. */
-  int FUNCTIONMAX = 138;
+  int FUNCTIONMATH2 = 138;
   /** RegularExpression Id. */
-  int FUNCTIONCLAMP = 139;
+  int FUNCTIONROUND = 139;
   /** RegularExpression Id. */
-  int FUNCTIONATTR = 140;
+  int FUNCTIONCLAMP = 140;
   /** RegularExpression Id. */
-  int FUNCTIONVAR = 141;
+  int FUNCTIONATTR = 141;
   /** RegularExpression Id. */
-  int FUNCTION = 142;
+  int FUNCTIONVAR = 142;
   /** RegularExpression Id. */
-  int HTMLSTARTTAG = 143;
+  int FUNCTION = 143;
   /** RegularExpression Id. */
-  int HTMLENDTAG = 144;
+  int HTMLSTARTTAG = 144;
+  /** RegularExpression Id. */
+  int HTMLENDTAG = 145;
 
   /** Lexical state. */
   int DEFAULT = 0;
@@ -424,7 +426,6 @@ public interface CssParserConstants {
     "",
     "",
     "",
-    "",
     "\"lang(\"",
     "\"dir(\"",
     "\"is(\"",
@@ -441,8 +442,10 @@ public interface CssParserConstants {
     "\"nth-last-of-type(\"",
     "\"not(\"",
     "",
-    "\"min(\"",
-    "\"max(\"",
+    "",
+    "",
+    "",
+    "\"round(\"",
     "\"clamp(\"",
     "\"attr(\"",
     "\"var(\"",
diff --git a/org/w3c/css/parser/analyzer/CssParserTokenManager.java b/org/w3c/css/parser/analyzer/CssParserTokenManager.java
index 4e140e078..df3db866c 100644
--- a/org/w3c/css/parser/analyzer/CssParserTokenManager.java
+++ b/org/w3c/css/parser/analyzer/CssParserTokenManager.java
@@ -45,7 +45,6 @@
 import org.w3c.css.values.CssBracket;
 import org.w3c.css.values.CssCalc;
 import org.w3c.css.values.CssCheckableValue;
-import org.w3c.css.values.CssClamp;
 import org.w3c.css.values.CssColor;
 import org.w3c.css.values.CssComparator;
 import org.w3c.css.values.CssExpression;
@@ -56,8 +55,7 @@
 import org.w3c.css.values.CssIdent;
 import org.w3c.css.values.CssImage;
 import org.w3c.css.values.CssLength;
-import org.w3c.css.values.CssMax;
-import org.w3c.css.values.CssMin;
+import org.w3c.css.values.CssMathFunction;
 import org.w3c.css.values.CssNumber;
 import org.w3c.css.values.CssOperator;
 import org.w3c.css.values.CssPercentage;
@@ -97,16 +95,16 @@ private int jjMoveStringLiteralDfa0_0(){
    switch(curChar)
    {
       case 33:
-         jjmatchedKind = 145;
+         jjmatchedKind = 146;
          return jjMoveNfa_0(7, 0);
       case 36:
-         jjmatchedKind = 146;
+         jjmatchedKind = 147;
          return jjMoveStringLiteralDfa1_0(0x1000000000000L, 0x0L, 0x0L);
       case 37:
-         jjmatchedKind = 147;
+         jjmatchedKind = 148;
          return jjMoveNfa_0(7, 0);
       case 38:
-         jjmatchedKind = 148;
+         jjmatchedKind = 149;
          return jjMoveNfa_0(7, 0);
       case 40:
          jjmatchedKind = 58;
@@ -133,13 +131,13 @@ private int jjMoveStringLiteralDfa0_0(){
          jjmatchedKind = 51;
          return jjMoveNfa_0(7, 0);
       case 60:
-         jjmatchedKind = 151;
-         return jjMoveStringLiteralDfa1_0(0x800000L, 0x0L, 0x2000000L);
+         jjmatchedKind = 152;
+         return jjMoveStringLiteralDfa1_0(0x800000L, 0x0L, 0x4000000L);
       case 61:
          jjmatchedKind = 50;
          return jjMoveNfa_0(7, 0);
       case 63:
-         jjmatchedKind = 150;
+         jjmatchedKind = 151;
          return jjMoveNfa_0(7, 0);
       case 64:
          return jjMoveStringLiteralDfa1_0(0x0L, 0x1fffffff8000L, 0x0L);
@@ -152,46 +150,46 @@ private int jjMoveStringLiteralDfa0_0(){
       case 94:
          return jjMoveStringLiteralDfa1_0(0x800000000000L, 0x0L, 0x0L);
       case 96:
-         jjmatchedKind = 149;
+         jjmatchedKind = 150;
          return jjMoveNfa_0(7, 0);
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa1_0(0x800000000L, 0x0L, 0x1000L);
+         return jjMoveStringLiteralDfa1_0(0x800000000L, 0x0L, 0x2000L);
       case 67:
       case 99:
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x800L);
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x1000L);
       case 68:
       case 100:
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x400000000000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x200000000000000L, 0x0L);
       case 72:
       case 104:
-         return jjMoveStringLiteralDfa1_0(0x0L, 0xa000000000000000L, 0x1L);
+         return jjMoveStringLiteralDfa1_0(0x0L, 0xd000000000000000L, 0x0L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x800000000000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x400000000000000L, 0x0L);
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x200000000000000L, 0x0L);
-      case 77:
-      case 109:
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x600L);
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x100000000000000L, 0x0L);
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa1_0(0x4000000000L, 0x0L, 0xfeL);
+         return jjMoveStringLiteralDfa1_0(0x4000000000L, 0x0L, 0x7fL);
       case 79:
       case 111:
          return jjMoveStringLiteralDfa1_0(0x3000000000L, 0x0L, 0x0L);
+      case 82:
+      case 114:
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x800L);
       case 83:
       case 115:
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x4000000000000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x2000000000000000L, 0x0L);
       case 86:
       case 118:
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x2000L);
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x4000L);
       case 87:
       case 119:
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x1000000000000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x800000000000000L, 0x0L);
       case 124:
-         jjmatchedKind = 152;
+         jjmatchedKind = 153;
          return jjMoveStringLiteralDfa1_0(0x4000000L, 0x0L, 0x0L);
       case 125:
          jjmatchedKind = 46;
@@ -246,15 +244,15 @@ else if ((active0 & 0x2000000000000L) != 0L)
             jjmatchedKind = 49;
             jjmatchedPos = 1;
          }
-         else if ((active2 & 0x2000000L) != 0L)
+         else if ((active2 & 0x4000000L) != 0L)
          {
-            jjmatchedKind = 153;
+            jjmatchedKind = 154;
             jjmatchedPos = 1;
          }
          break;
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x2200000000000000L, active2, 0x2400L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x1100000000000000L, active2, 0x4000L);
       case 66:
       case 98:
          return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x7c00000L, active2, 0L);
@@ -266,16 +264,16 @@ else if ((active2 & 0x2000000L) != 0L)
          return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x1000000000L, active2, 0L);
       case 72:
       case 104:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x1000000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x800000000000000L, active2, 0L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x400000200000000L, active2, 0x200L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x200000200000000L, active2, 0L);
       case 75:
       case 107:
          return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x2000000000L, active2, 0L);
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x4000000038000000L, active2, 0x800L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x2000000038000000L, active2, 0x1000L);
       case 77:
       case 109:
          return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x800000000L, active2, 0L);
@@ -284,7 +282,7 @@ else if ((active2 & 0x2000000L) != 0L)
          return jjMoveStringLiteralDfa2_0(active0, 0x2800000000L, active1, 0x400000000L, active2, 0L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa2_0(active0, 0x4000000000L, active1, 0x8000000000000000L, active2, 0x81L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x4000000000L, active1, 0xc000000000000000L, active2, 0x840L);
       case 80:
       case 112:
          return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x44000010000L, active2, 0L);
@@ -298,10 +296,10 @@ else if ((active2 & 0x2000000L) != 0L)
          return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x1c0000000L, active2, 0L);
       case 83:
       case 115:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x800080000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x400080000000000L, active2, 0L);
       case 84:
       case 116:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x3e0000L, active2, 0x107eL);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x3e0000L, active2, 0x203fL);
       case 86:
       case 118:
          return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x100000000000L, active2, 0L);
@@ -320,9 +318,9 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long a
    switch(curChar)
    {
       case 40:
-         if ((active1 & 0x800000000000000L) != 0L)
+         if ((active1 & 0x400000000000000L) != 0L)
          {
-            jjmatchedKind = 123;
+            jjmatchedKind = 122;
             jjmatchedPos = 2;
          }
          break;
@@ -337,7 +335,7 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long a
          break;
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x400010000L, active2, 0x800L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x400010000L, active2, 0x1000L);
       case 68:
       case 100:
          if ((active0 & 0x800000000L) != 0L)
@@ -348,10 +346,10 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long a
          break;
       case 69:
       case 101:
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x1000002838000000L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x800002838000000L, active2, 0L);
       case 72:
       case 104:
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x40000008000L, active2, 0x7eL);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x40000008000L, active2, 0x3fL);
       case 73:
       case 105:
          return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x1001c0000000L, active2, 0L);
@@ -363,16 +361,16 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long a
          return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x200000000L, active2, 0L);
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x200000000000000L, active2, 0x200L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x100000000000000L, active2, 0L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x4000039007fe0000L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x2000039007fe0000L, active2, 0L);
       case 82:
       case 114:
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x400004000000000L, active2, 0x2000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x200004000000000L, active2, 0x4000L);
       case 83:
       case 115:
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0xa000000000000000L, active2, 0x1L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0xd000000000000000L, active2, 0L);
       case 84:
       case 116:
          if ((active0 & 0x4000000000L) != 0L)
@@ -380,13 +378,10 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long a
             jjmatchedKind = 38;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0L, active2, 0x1080L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0L, active2, 0x2040L);
       case 85:
       case 117:
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x80000000000L, active2, 0L);
-      case 88:
-      case 120:
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0L, active2, 0x400L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x80000000000L, active2, 0x800L);
       default :
          break;
    }
@@ -402,34 +397,24 @@ private int jjMoveStringLiteralDfa3_0(long old0, long active0, long old1, long a
    switch(curChar)
    {
       case 40:
-         if ((active1 & 0x400000000000000L) != 0L)
-         {
-            jjmatchedKind = 122;
-            jjmatchedPos = 3;
-         }
-         else if ((active1 & 0x2000000000000000L) != 0L)
-         {
-            jjmatchedKind = 125;
-            jjmatchedPos = 3;
-         }
-         else if ((active2 & 0x80L) != 0L)
+         if ((active1 & 0x200000000000000L) != 0L)
          {
-            jjmatchedKind = 135;
+            jjmatchedKind = 121;
             jjmatchedPos = 3;
          }
-         else if ((active2 & 0x200L) != 0L)
+         else if ((active1 & 0x1000000000000000L) != 0L)
          {
-            jjmatchedKind = 137;
+            jjmatchedKind = 124;
             jjmatchedPos = 3;
          }
-         else if ((active2 & 0x400L) != 0L)
+         else if ((active2 & 0x40L) != 0L)
          {
-            jjmatchedKind = 138;
+            jjmatchedKind = 134;
             jjmatchedPos = 3;
          }
-         else if ((active2 & 0x2000L) != 0L)
+         else if ((active2 & 0x4000L) != 0L)
          {
-            jjmatchedKind = 141;
+            jjmatchedKind = 142;
             jjmatchedPos = 3;
          }
          break;
@@ -439,7 +424,7 @@ else if ((active2 & 0x2000L) != 0L)
             jjmatchedKind = 23;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0L, active2, 0x7eL);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0L, active2, 0x3fL);
       case 65:
       case 97:
          return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x8000L, active2, 0L);
@@ -454,16 +439,16 @@ else if ((active2 & 0x2000L) != 0L)
          return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x38000000L, active2, 0L);
       case 71:
       case 103:
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x2000001c0010000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x1000001c0010000L, active2, 0L);
       case 76:
       case 108:
          return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x8000000000L, active2, 0L);
       case 77:
       case 109:
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x400000000L, active2, 0x800L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x400000000L, active2, 0x1000L);
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x1000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x1000000000L, active2, 0x800L);
       case 79:
       case 111:
          return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x40000000000L, active2, 0L);
@@ -472,10 +457,10 @@ else if ((active2 & 0x2000L) != 0L)
          return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x802003e0000L, active2, 0L);
       case 82:
       case 114:
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x1000000000000000L, active2, 0x1000L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x800000000000000L, active2, 0x2000L);
       case 84:
       case 116:
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0xc000000007c00000L, active2, 0x1L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0xe000000007c00000L, active2, 0L);
       case 85:
       case 117:
          return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x30000000000L, active2, 0L);
@@ -502,27 +487,30 @@ private int jjMoveStringLiteralDfa4_0(long old0, long active0, long old1, long a
    switch(curChar)
    {
       case 40:
-         if ((active1 & 0x200000000000000L) != 0L)
+         if ((active1 & 0x100000000000000L) != 0L)
          {
-            jjmatchedKind = 121;
+            jjmatchedKind = 120;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x8000000000000000L) != 0L)
+         else if ((active1 & 0x4000000000000000L) != 0L)
          {
-            jjmatchedKind = 127;
+            jjmatchedKind = 126;
             jjmatchedPos = 4;
          }
-         else if ((active2 & 0x1000L) != 0L)
+         else if ((active2 & 0x2000L) != 0L)
          {
-            jjmatchedKind = 140;
+            jjmatchedKind = 141;
             jjmatchedPos = 4;
          }
          break;
       case 45:
-         return jjMoveStringLiteralDfa5_0(active1, 0x3e0000L, active2, 0x1L);
+         return jjMoveStringLiteralDfa5_0(active1, 0x80000000003e0000L, active2, 0L);
       case 67:
       case 99:
-         return jjMoveStringLiteralDfa5_0(active1, 0L, active2, 0xaL);
+         return jjMoveStringLiteralDfa5_0(active1, 0L, active2, 0x5L);
+      case 68:
+      case 100:
+         return jjMoveStringLiteralDfa5_0(active1, 0L, active2, 0x800L);
       case 69:
       case 101:
          if ((active1 & 0x10000L) != 0L)
@@ -530,7 +518,7 @@ else if ((active2 & 0x1000L) != 0L)
             jjmatchedKind = 80;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active1, 0x1000000400000000L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active1, 0x800000400000000L, active2, 0L);
       case 70:
       case 102:
          return jjMoveStringLiteralDfa5_0(active1, 0x6000000000L, active2, 0L);
@@ -542,22 +530,22 @@ else if ((active2 & 0x1000L) != 0L)
          return jjMoveStringLiteralDfa5_0(active1, 0x800000000L, active2, 0L);
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa5_0(active1, 0L, active2, 0x54L);
+         return jjMoveStringLiteralDfa5_0(active1, 0L, active2, 0x2aL);
       case 78:
       case 110:
          return jjMoveStringLiteralDfa5_0(active1, 0x70000000000L, active2, 0L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa5_0(active1, 0x8200000000L, active2, 0x20L);
+         return jjMoveStringLiteralDfa5_0(active1, 0x8200000000L, active2, 0x10L);
       case 80:
       case 112:
-         return jjMoveStringLiteralDfa5_0(active1, 0x80000000000L, active2, 0x800L);
+         return jjMoveStringLiteralDfa5_0(active1, 0x80000000000L, active2, 0x1000L);
       case 82:
       case 114:
          return jjMoveStringLiteralDfa5_0(active1, 0x8000L, active2, 0L);
       case 84:
       case 116:
-         return jjMoveStringLiteralDfa5_0(active1, 0x400000103fc00000L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active1, 0x200000103fc00000L, active2, 0L);
       case 87:
       case 119:
          return jjMoveStringLiteralDfa5_0(active1, 0x100000000000L, active2, 0L);
@@ -576,9 +564,9 @@ private int jjMoveStringLiteralDfa5_0(long old1, long active1, long old2, long a
    switch(curChar)
    {
       case 40:
-         if ((active1 & 0x1000000000000000L) != 0L)
+         if ((active1 & 0x800000000000000L) != 0L)
          {
-            jjmatchedKind = 124;
+            jjmatchedKind = 123;
             jjmatchedPos = 5;
          }
          else if ((active2 & 0x800L) != 0L)
@@ -586,6 +574,11 @@ else if ((active2 & 0x800L) != 0L)
             jjmatchedKind = 139;
             jjmatchedPos = 5;
          }
+         else if ((active2 & 0x1000L) != 0L)
+         {
+            jjmatchedKind = 140;
+            jjmatchedPos = 5;
+         }
          break;
       case 45:
          return jjMoveStringLiteralDfa6_0(active1, 0x1038000000L, active2, 0L);
@@ -596,25 +589,25 @@ else if ((active2 & 0x800L) != 0L)
             jjmatchedKind = 99;
             jjmatchedPos = 5;
          }
-         return jjMoveStringLiteralDfa6_0(active1, 0L, active2, 0x54L);
+         return jjMoveStringLiteralDfa6_0(active1, 0L, active2, 0x2aL);
       case 67:
       case 99:
-         return jjMoveStringLiteralDfa6_0(active1, 0x80000L, active2, 0x1L);
+         return jjMoveStringLiteralDfa6_0(active1, 0x8000000000080000L, active2, 0L);
       case 69:
       case 101:
-         return jjMoveStringLiteralDfa6_0(active1, 0x4000044000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active1, 0x2000044000000000L, active2, 0L);
       case 70:
       case 102:
-         return jjMoveStringLiteralDfa6_0(active1, 0L, active2, 0x20L);
+         return jjMoveStringLiteralDfa6_0(active1, 0L, active2, 0x10L);
       case 72:
       case 104:
-         return jjMoveStringLiteralDfa6_0(active1, 0L, active2, 0x2L);
+         return jjMoveStringLiteralDfa6_0(active1, 0L, active2, 0x1L);
       case 76:
       case 108:
          return jjMoveStringLiteralDfa6_0(active1, 0x60000L, active2, 0L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa6_0(active1, 0x80007c00000L, active2, 0x8L);
+         return jjMoveStringLiteralDfa6_0(active1, 0x80007c00000L, active2, 0x4L);
       case 80:
       case 112:
          return jjMoveStringLiteralDfa6_0(active1, 0x100000000000L, active2, 0L);
@@ -642,7 +635,7 @@ private int jjMoveStringLiteralDfa6_0(long old1, long active1, long old2, long a
    switch(curChar)
    {
       case 45:
-         return jjMoveStringLiteralDfa7_0(active1, 0x81c0000000L, active2, 0x20L);
+         return jjMoveStringLiteralDfa7_0(active1, 0x81c0000000L, active2, 0x10L);
       case 65:
       case 97:
          return jjMoveStringLiteralDfa7_0(active1, 0x2000000000L, active2, 0L);
@@ -651,7 +644,7 @@ private int jjMoveStringLiteralDfa6_0(long old1, long active1, long old2, long a
          return jjMoveStringLiteralDfa7_0(active1, 0x20000000L, active2, 0L);
       case 68:
       case 100:
-         return jjMoveStringLiteralDfa7_0(active1, 0x4000000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa7_0(active1, 0x2000000000000000L, active2, 0L);
       case 69:
       case 101:
          return jjMoveStringLiteralDfa7_0(active1, 0x300000e8000L, active2, 0L);
@@ -660,16 +653,16 @@ private int jjMoveStringLiteralDfa6_0(long old1, long active1, long old2, long a
          return jjMoveStringLiteralDfa7_0(active1, 0x1000000000L, active2, 0L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa7_0(active1, 0x300000L, active2, 0x2L);
+         return jjMoveStringLiteralDfa7_0(active1, 0x300000L, active2, 0x1L);
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa7_0(active1, 0L, active2, 0x8L);
+         return jjMoveStringLiteralDfa7_0(active1, 0L, active2, 0x4L);
       case 77:
       case 109:
          return jjMoveStringLiteralDfa7_0(active1, 0x17c00000L, active2, 0L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa7_0(active1, 0x100000000000L, active2, 0x1L);
+         return jjMoveStringLiteralDfa7_0(active1, 0x8000100000000000L, active2, 0L);
       case 80:
       case 112:
          return jjMoveStringLiteralDfa7_0(active1, 0x400000000L, active2, 0L);
@@ -678,7 +671,7 @@ private int jjMoveStringLiteralDfa6_0(long old1, long active1, long old2, long a
          return jjMoveStringLiteralDfa7_0(active1, 0x84000000000L, active2, 0L);
       case 83:
       case 115:
-         return jjMoveStringLiteralDfa7_0(active1, 0L, active2, 0x54L);
+         return jjMoveStringLiteralDfa7_0(active1, 0L, active2, 0x2aL);
       case 84:
       case 116:
          if ((active1 & 0x200000000L) != 0L)
@@ -702,14 +695,14 @@ private int jjMoveStringLiteralDfa7_0(long old1, long active1, long old2, long a
    switch(curChar)
    {
       case 40:
-         if ((active1 & 0x4000000000000000L) != 0L)
+         if ((active1 & 0x2000000000000000L) != 0L)
          {
-            jjmatchedKind = 126;
+            jjmatchedKind = 125;
             jjmatchedPos = 7;
          }
-         else if ((active2 & 0x8L) != 0L)
+         else if ((active2 & 0x4L) != 0L)
          {
-            jjmatchedKind = 131;
+            jjmatchedKind = 130;
             jjmatchedPos = 7;
          }
          break;
@@ -735,13 +728,13 @@ else if ((active2 & 0x8L) != 0L)
          return jjMoveStringLiteralDfa8_0(active1, 0x40010000000L, active2, 0L);
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa8_0(active1, 0L, active2, 0x2L);
+         return jjMoveStringLiteralDfa8_0(active1, 0L, active2, 0x1L);
       case 77:
       case 109:
          return jjMoveStringLiteralDfa8_0(active1, 0x2080000000L, active2, 0L);
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa8_0(active1, 0x80000L, active2, 0x1L);
+         return jjMoveStringLiteralDfa8_0(active1, 0x8000000000080000L, active2, 0L);
       case 79:
       case 111:
          return jjMoveStringLiteralDfa8_0(active1, 0x28000000L, active2, 0L);
@@ -763,7 +756,7 @@ else if ((active2 & 0x8L) != 0L)
             jjmatchedKind = 79;
             jjmatchedPos = 7;
          }
-         return jjMoveStringLiteralDfa8_0(active1, 0x80040000000L, active2, 0x74L);
+         return jjMoveStringLiteralDfa8_0(active1, 0x80040000000L, active2, 0x3aL);
       default :
          break;
    }
@@ -779,13 +772,13 @@ private int jjMoveStringLiteralDfa8_0(long old1, long active1, long old2, long a
    switch(curChar)
    {
       case 45:
-         return jjMoveStringLiteralDfa9_0(active1, 0x20000000000L, active2, 0x54L);
+         return jjMoveStringLiteralDfa9_0(active1, 0x20000000000L, active2, 0x2aL);
       case 67:
       case 99:
          return jjMoveStringLiteralDfa9_0(active1, 0x41401000000L, active2, 0L);
       case 68:
       case 100:
-         return jjMoveStringLiteralDfa9_0(active1, 0x10000000L, active2, 0x2L);
+         return jjMoveStringLiteralDfa9_0(active1, 0x10000000L, active2, 0x1L);
       case 69:
       case 101:
          return jjMoveStringLiteralDfa9_0(active1, 0x2000000000L, active2, 0L);
@@ -835,10 +828,10 @@ else if ((active1 & 0x100000000000L) != 0L)
             jjmatchedKind = 108;
             jjmatchedPos = 8;
          }
-         return jjMoveStringLiteralDfa9_0(active1, 0x200a0000L, active2, 0x1L);
+         return jjMoveStringLiteralDfa9_0(active1, 0x80000000200a0000L, active2, 0L);
       case 89:
       case 121:
-         return jjMoveStringLiteralDfa9_0(active1, 0L, active2, 0x20L);
+         return jjMoveStringLiteralDfa9_0(active1, 0L, active2, 0x10L);
       default :
          break;
    }
@@ -854,9 +847,9 @@ private int jjMoveStringLiteralDfa9_0(long old1, long active1, long old2, long a
    switch(curChar)
    {
       case 40:
-         if ((active2 & 0x2L) != 0L)
+         if ((active2 & 0x1L) != 0L)
          {
-            jjmatchedKind = 129;
+            jjmatchedKind = 128;
             jjmatchedPos = 9;
          }
          break;
@@ -864,7 +857,7 @@ private int jjMoveStringLiteralDfa9_0(long old1, long active1, long old2, long a
          return jjMoveStringLiteralDfa10_0(active1, 0x40000020000L, active2, 0L);
       case 67:
       case 99:
-         return jjMoveStringLiteralDfa10_0(active1, 0x4000000000L, active2, 0x14L);
+         return jjMoveStringLiteralDfa10_0(active1, 0x4000000000L, active2, 0xaL);
       case 68:
       case 100:
          return jjMoveStringLiteralDfa10_0(active1, 0x90000000L, active2, 0L);
@@ -880,13 +873,13 @@ else if ((active1 & 0x1000000000L) != 0L)
             jjmatchedKind = 100;
             jjmatchedPos = 9;
          }
-         return jjMoveStringLiteralDfa10_0(active1, 0x1c80000L, active2, 0x1L);
+         return jjMoveStringLiteralDfa10_0(active1, 0x8000000001c80000L, active2, 0L);
       case 73:
       case 105:
          return jjMoveStringLiteralDfa10_0(active1, 0x6000000L, active2, 0L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa10_0(active1, 0x8000000000L, active2, 0x40L);
+         return jjMoveStringLiteralDfa10_0(active1, 0x8000000000L, active2, 0x20L);
       case 80:
       case 112:
          if ((active1 & 0x40000000L) != 0L)
@@ -894,7 +887,7 @@ else if ((active1 & 0x1000000000L) != 0L)
             jjmatchedKind = 94;
             jjmatchedPos = 9;
          }
-         return jjMoveStringLiteralDfa10_0(active1, 0L, active2, 0x20L);
+         return jjMoveStringLiteralDfa10_0(active1, 0L, active2, 0x10L);
       case 83:
       case 115:
          if ((active1 & 0x2000000000L) != 0L)
@@ -943,16 +936,16 @@ private int jjMoveStringLiteralDfa10_0(long old1, long active1, long old2, long
             jjmatchedKind = 102;
             jjmatchedPos = 10;
          }
-         return jjMoveStringLiteralDfa11_0(active1, 0L, active2, 0x20L);
+         return jjMoveStringLiteralDfa11_0(active1, 0L, active2, 0x10L);
       case 70:
       case 102:
-         return jjMoveStringLiteralDfa11_0(active1, 0x8000c00000L, active2, 0x40L);
+         return jjMoveStringLiteralDfa11_0(active1, 0x8000c00000L, active2, 0x20L);
       case 71:
       case 103:
          return jjMoveStringLiteralDfa11_0(active1, 0x6000000L, active2, 0L);
       case 72:
       case 104:
-         return jjMoveStringLiteralDfa11_0(active1, 0L, active2, 0x4L);
+         return jjMoveStringLiteralDfa11_0(active1, 0L, active2, 0x2L);
       case 76:
       case 108:
          return jjMoveStringLiteralDfa11_0(active1, 0x10000000L, active2, 0L);
@@ -961,7 +954,7 @@ private int jjMoveStringLiteralDfa10_0(long old1, long active1, long old2, long
          return jjMoveStringLiteralDfa11_0(active1, 0x1000000L, active2, 0L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa11_0(active1, 0x20000000L, active2, 0x10L);
+         return jjMoveStringLiteralDfa11_0(active1, 0x20000000L, active2, 0x8L);
       case 82:
       case 114:
          if ((active1 & 0x80000L) != 0L)
@@ -975,7 +968,7 @@ private int jjMoveStringLiteralDfa10_0(long old1, long active1, long old2, long
          return jjMoveStringLiteralDfa11_0(active1, 0x20100000000L, active2, 0L);
       case 88:
       case 120:
-         return jjMoveStringLiteralDfa11_0(active1, 0L, active2, 0x1L);
+         return jjMoveStringLiteralDfa11_0(active1, 0x8000000000000000L, active2, 0L);
       default :
          break;
    }
@@ -991,14 +984,14 @@ private int jjMoveStringLiteralDfa11_0(long old1, long active1, long old2, long
    switch(curChar)
    {
       case 40:
-         if ((active2 & 0x20L) != 0L)
+         if ((active2 & 0x10L) != 0L)
          {
-            jjmatchedKind = 133;
+            jjmatchedKind = 132;
             jjmatchedPos = 11;
          }
          break;
       case 45:
-         return jjMoveStringLiteralDfa12_0(active1, 0L, active2, 0x40L);
+         return jjMoveStringLiteralDfa12_0(active1, 0L, active2, 0x20L);
       case 67:
       case 99:
          return jjMoveStringLiteralDfa12_0(active1, 0x200000L, active2, 0L);
@@ -1015,10 +1008,10 @@ private int jjMoveStringLiteralDfa11_0(long old1, long active1, long old2, long
          return jjMoveStringLiteralDfa12_0(active1, 0x6000000L, active2, 0L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa12_0(active1, 0x8000000000L, active2, 0x4L);
+         return jjMoveStringLiteralDfa12_0(active1, 0x8000000000L, active2, 0x2L);
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa12_0(active1, 0x40080000000L, active2, 0x10L);
+         return jjMoveStringLiteralDfa12_0(active1, 0x40080000000L, active2, 0x8L);
       case 77:
       case 109:
          if ((active1 & 0x20000000L) != 0L)
@@ -1037,7 +1030,7 @@ private int jjMoveStringLiteralDfa11_0(long old1, long active1, long old2, long
             jjmatchedKind = 87;
             jjmatchedPos = 11;
          }
-         return jjMoveStringLiteralDfa12_0(active1, 0x1400000L, active2, 0x1L);
+         return jjMoveStringLiteralDfa12_0(active1, 0x8000000001400000L, active2, 0L);
       case 89:
       case 121:
          return jjMoveStringLiteralDfa12_0(active1, 0x20000000000L, active2, 0L);
@@ -1056,14 +1049,14 @@ private int jjMoveStringLiteralDfa12_0(long old1, long active1, long old2, long
    switch(curChar)
    {
       case 40:
-         if ((active2 & 0x1L) != 0L)
+         if ((active1 & 0x8000000000000000L) != 0L)
          {
-            jjmatchedKind = 128;
+            jjmatchedKind = 127;
             jjmatchedPos = 12;
          }
-         else if ((active2 & 0x10L) != 0L)
+         else if ((active2 & 0x8L) != 0L)
          {
-            jjmatchedKind = 132;
+            jjmatchedKind = 131;
             jjmatchedPos = 12;
          }
          break;
@@ -1079,7 +1072,7 @@ else if ((active2 & 0x10L) != 0L)
          return jjMoveStringLiteralDfa13_0(active1, 0x1000000L, active2, 0L);
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa13_0(active1, 0x28000000000L, active2, 0x4L);
+         return jjMoveStringLiteralDfa13_0(active1, 0x28000000000L, active2, 0x2L);
       case 77:
       case 109:
          if ((active1 & 0x100000000L) != 0L)
@@ -1104,7 +1097,7 @@ else if ((active2 & 0x10L) != 0L)
             jjmatchedKind = 89;
             jjmatchedPos = 12;
          }
-         return jjMoveStringLiteralDfa13_0(active1, 0x4000000L, active2, 0x40L);
+         return jjMoveStringLiteralDfa13_0(active1, 0x4000000L, active2, 0x20L);
       default :
          break;
    }
@@ -1126,7 +1119,7 @@ private int jjMoveStringLiteralDfa13_0(long old1, long active1, long old2, long
          return jjMoveStringLiteralDfa14_0(active1, 0x400000L, active2, 0L);
       case 68:
       case 100:
-         return jjMoveStringLiteralDfa14_0(active1, 0L, active2, 0x4L);
+         return jjMoveStringLiteralDfa14_0(active1, 0L, active2, 0x2L);
       case 69:
       case 101:
          if ((active1 & 0x8000000000L) != 0L)
@@ -1156,7 +1149,7 @@ else if ((active1 & 0x20000000000L) != 0L)
          return jjMoveStringLiteralDfa14_0(active1, 0x200000L, active2, 0L);
       case 89:
       case 121:
-         return jjMoveStringLiteralDfa14_0(active1, 0L, active2, 0x40L);
+         return jjMoveStringLiteralDfa14_0(active1, 0L, active2, 0x20L);
       default :
          break;
    }
@@ -1172,9 +1165,9 @@ private int jjMoveStringLiteralDfa14_0(long old1, long active1, long old2, long
    switch(curChar)
    {
       case 40:
-         if ((active2 & 0x4L) != 0L)
+         if ((active2 & 0x2L) != 0L)
          {
-            jjmatchedKind = 130;
+            jjmatchedKind = 129;
             jjmatchedPos = 14;
          }
          break;
@@ -1195,7 +1188,7 @@ private int jjMoveStringLiteralDfa14_0(long old1, long active1, long old2, long
          return jjMoveStringLiteralDfa15_0(active1, 0x400000L, active2, 0L);
       case 80:
       case 112:
-         return jjMoveStringLiteralDfa15_0(active1, 0L, active2, 0x40L);
+         return jjMoveStringLiteralDfa15_0(active1, 0L, active2, 0x20L);
       default :
          break;
    }
@@ -1215,7 +1208,7 @@ private int jjMoveStringLiteralDfa15_0(long old1, long active1, long old2, long
          return jjMoveStringLiteralDfa16_0(active1, 0x40000000000L, active2, 0L);
       case 69:
       case 101:
-         return jjMoveStringLiteralDfa16_0(active1, 0x200000L, active2, 0x40L);
+         return jjMoveStringLiteralDfa16_0(active1, 0x200000L, active2, 0x20L);
       case 79:
       case 111:
          return jjMoveStringLiteralDfa16_0(active1, 0x4000000L, active2, 0L);
@@ -1242,9 +1235,9 @@ private int jjMoveStringLiteralDfa16_0(long old1, long active1, long old2, long
    switch(curChar)
    {
       case 40:
-         if ((active2 & 0x40L) != 0L)
+         if ((active2 & 0x20L) != 0L)
          {
-            jjmatchedKind = 134;
+            jjmatchedKind = 133;
             jjmatchedPos = 16;
          }
          break;
@@ -1358,7 +1351,7 @@ private int jjMoveNfa_0(int startState, int curPos)
    catch(java.io.IOException e) { throw new Error("Internal Error"); }
    curPos = 0;
    int startsAt = 0;
-   jjnewStateCnt = 1054;
+   jjnewStateCnt = 1082;
    int i = 1;
    jjstateSet[0] = startState;
    int kind = 0x7fffffff;
@@ -1378,36 +1371,36 @@ private int jjMoveNfa_0(int startState, int curPos)
                   {
                      if (kind > 75)
                         kind = 75;
-                     { jjCheckNAddStates(0, 171); }
+                     { jjCheckNAddStates(0, 173); }
                   }
                   else if ((0x100003600L & l) != 0L)
                   {
                      if (kind > 21)
                         kind = 21;
-                     { jjCheckNAddStates(172, 197); }
+                     { jjCheckNAddStates(174, 199); }
                   }
                   else if (curChar == 33)
-                     { jjCheckNAddStates(198, 201); }
+                     { jjCheckNAddStates(200, 203); }
                   else if (curChar == 46)
-                     { jjCheckNAddStates(202, 237); }
+                     { jjCheckNAddStates(204, 234); }
                   else if (curChar == 35)
-                     { jjCheckNAddStates(238, 242); }
+                     { jjCheckNAddStates(235, 239); }
                   else if (curChar == 45)
-                     { jjAddStates(243, 247); }
+                     { jjAddStates(240, 244); }
                   else if (curChar == 39)
                   {
                      if (kind > 40)
                         kind = 40;
-                     { jjCheckNAddStates(248, 252); }
+                     { jjCheckNAddStates(245, 249); }
                   }
                   else if (curChar == 34)
                   {
                      if (kind > 40)
                         kind = 40;
-                     { jjCheckNAddStates(253, 257); }
+                     { jjCheckNAddStates(250, 254); }
                   }
                   else if (curChar == 60)
-                     jjstateSet[jjnewStateCnt++] = 217;
+                     jjstateSet[jjnewStateCnt++] = 195;
                   else if (curChar == 44)
                   {
                      if (kind > 32)
@@ -1423,9 +1416,9 @@ else if (curChar == 43)
                   else if (curChar == 47)
                      jjstateSet[jjnewStateCnt++] = 0;
                   if (curChar == 45)
-                     { jjAddStates(258, 259); }
+                     { jjAddStates(255, 256); }
                   else if (curChar == 60)
-                     { jjCheckNAddStates(260, 264); }
+                     { jjCheckNAddStates(257, 261); }
                   else if (curChar == 62)
                   {
                      if (kind > 30)
@@ -1442,7 +1435,7 @@ else if (curChar == 62)
                   break;
                case 2:
                   if (curChar == 42)
-                     { jjCheckNAddStates(265, 267); }
+                     { jjCheckNAddStates(262, 264); }
                   break;
                case 3:
                   if ((0xffff7bffffffffffL & l) != 0L)
@@ -1454,7 +1447,7 @@ else if (curChar == 62)
                   break;
                case 5:
                   if (curChar == 42)
-                     { jjCheckNAddStates(268, 270); }
+                     { jjCheckNAddStates(265, 267); }
                   break;
                case 6:
                   if (curChar == 47 && kind > 1)
@@ -1480,3598 +1473,3445 @@ else if (curChar == 62)
                   if (curChar == 44 && kind > 32)
                      kind = 32;
                   break;
-               case 16:
-                  if (curChar == 46)
-                     jjstateSet[jjnewStateCnt++] = 17;
-                  break;
-               case 18:
-                  if ((0xfffffdffffffffffL & l) != 0L)
-                     { jjAddStates(271, 272); }
-                  break;
-               case 19:
-                  if (curChar == 41 && kind > 44)
-                     kind = 44;
-                  break;
-               case 29:
-                  if (curChar == 46)
-                     jjstateSet[jjnewStateCnt++] = 28;
-                  break;
-               case 46:
-                  if (curChar == 58)
-                     jjstateSet[jjnewStateCnt++] = 45;
-                  break;
-               case 54:
+               case 17:
                   if (curChar == 45)
-                     { jjAddStates(273, 274); }
+                     { jjAddStates(268, 269); }
                   break;
-               case 56:
+               case 19:
                   if ((0x3ff200000000000L & l) == 0L)
                      break;
                   if (kind > 109)
                      kind = 109;
-                  { jjCheckNAddTwoStates(56, 57); }
+                  { jjCheckNAddTwoStates(19, 20); }
                   break;
-               case 58:
+               case 21:
                   if ((0xfc00ffffffffcbffL & l) == 0L)
                      break;
                   if (kind > 109)
                      kind = 109;
-                  { jjCheckNAddTwoStates(56, 57); }
+                  { jjCheckNAddTwoStates(19, 20); }
                   break;
-               case 59:
+               case 22:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 109)
                      kind = 109;
-                  { jjCheckNAddStates(275, 279); }
+                  { jjCheckNAddStates(270, 274); }
                   break;
-               case 60:
+               case 23:
                   if (curChar != 10)
                      break;
                   if (kind > 109)
                      kind = 109;
-                  { jjCheckNAddTwoStates(56, 57); }
+                  { jjCheckNAddTwoStates(19, 20); }
                   break;
-               case 61:
-               case 70:
+               case 24:
+               case 33:
                   if (curChar == 13)
-                     { jjCheckNAdd(60); }
+                     { jjCheckNAdd(23); }
                   break;
-               case 62:
+               case 25:
                   if ((0x100003600L & l) == 0L)
                      break;
                   if (kind > 109)
                      kind = 109;
-                  { jjCheckNAddTwoStates(56, 57); }
+                  { jjCheckNAddTwoStates(19, 20); }
                   break;
-               case 63:
+               case 26:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 109)
                      kind = 109;
-                  { jjCheckNAddStates(280, 287); }
+                  { jjCheckNAddStates(275, 282); }
                   break;
-               case 64:
+               case 27:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 109)
                      kind = 109;
-                  { jjCheckNAddStates(288, 291); }
+                  { jjCheckNAddStates(283, 286); }
                   break;
-               case 65:
+               case 28:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 109)
                      kind = 109;
-                  { jjCheckNAddStates(292, 296); }
+                  { jjCheckNAddStates(287, 291); }
                   break;
-               case 66:
+               case 29:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 109)
                      kind = 109;
-                  { jjCheckNAddStates(297, 302); }
+                  { jjCheckNAddStates(292, 297); }
                   break;
-               case 67:
+               case 30:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 109)
                      kind = 109;
-                  { jjCheckNAddStates(303, 309); }
+                  { jjCheckNAddStates(298, 304); }
                   break;
-               case 69:
+               case 32:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 109)
                      kind = 109;
-                  { jjCheckNAddStates(310, 314); }
+                  { jjCheckNAddStates(305, 309); }
                   break;
-               case 71:
+               case 34:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 109)
                      kind = 109;
-                  { jjCheckNAddStates(315, 322); }
+                  { jjCheckNAddStates(310, 317); }
                   break;
-               case 72:
+               case 35:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 109)
                      kind = 109;
-                  { jjCheckNAddStates(323, 326); }
+                  { jjCheckNAddStates(318, 321); }
                   break;
-               case 73:
+               case 36:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 109)
                      kind = 109;
-                  { jjCheckNAddStates(327, 331); }
+                  { jjCheckNAddStates(322, 326); }
                   break;
-               case 74:
+               case 37:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 109)
                      kind = 109;
-                  { jjCheckNAddStates(332, 337); }
+                  { jjCheckNAddStates(327, 332); }
                   break;
-               case 75:
+               case 38:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 109)
                      kind = 109;
-                  { jjCheckNAddStates(338, 344); }
+                  { jjCheckNAddStates(333, 339); }
                   break;
-               case 76:
+               case 39:
                   if (curChar == 40 && kind > 136)
                      kind = 136;
                   break;
-               case 81:
+               case 45:
+                  if (curChar == 40 && kind > 137)
+                     kind = 137;
+                  break;
+               case 52:
+                  if (curChar == 40 && kind > 138)
+                     kind = 138;
+                  break;
+               case 59:
                   if (curChar == 60)
-                     { jjCheckNAddStates(260, 264); }
+                     { jjCheckNAddStates(257, 261); }
                   break;
-               case 83:
+               case 61:
                   if ((0x100003600L & l) != 0L)
-                     { jjCheckNAddStates(345, 349); }
+                     { jjCheckNAddStates(340, 344); }
                   break;
-               case 84:
+               case 62:
                   if (curChar == 42)
-                     { jjCheckNAddTwoStates(85, 86); }
+                     { jjCheckNAddTwoStates(63, 64); }
                   break;
-               case 85:
+               case 63:
                   if ((0xfffffbffffffffffL & l) != 0L)
-                     { jjCheckNAddTwoStates(85, 86); }
+                     { jjCheckNAddTwoStates(63, 64); }
                   break;
-               case 86:
+               case 64:
                   if (curChar == 42)
-                     { jjCheckNAddStates(350, 352); }
+                     { jjCheckNAddStates(345, 347); }
                   break;
-               case 87:
+               case 65:
                   if ((0xffff7bffffffffffL & l) != 0L)
-                     { jjCheckNAddTwoStates(88, 89); }
+                     { jjCheckNAddTwoStates(66, 67); }
                   break;
-               case 88:
+               case 66:
                   if ((0xfffffbffffffffffL & l) != 0L)
-                     { jjCheckNAddTwoStates(88, 89); }
+                     { jjCheckNAddTwoStates(66, 67); }
                   break;
-               case 89:
+               case 67:
                   if (curChar == 42)
-                     { jjCheckNAddStates(353, 355); }
+                     { jjCheckNAddStates(348, 350); }
                   break;
-               case 90:
+               case 68:
                   if (curChar == 47)
-                     { jjCheckNAddStates(345, 349); }
+                     { jjCheckNAddStates(340, 344); }
                   break;
-               case 91:
+               case 69:
                   if (curChar == 47)
-                     jjstateSet[jjnewStateCnt++] = 84;
+                     jjstateSet[jjnewStateCnt++] = 62;
                   break;
-               case 92:
+               case 70:
                   if (curChar == 45)
-                     { jjCheckNAddTwoStates(93, 202); }
+                     { jjCheckNAddTwoStates(71, 180); }
                   break;
-               case 94:
+               case 72:
                   if ((0x3ff200000000000L & l) != 0L)
-                     { jjCheckNAddStates(356, 361); }
+                     { jjCheckNAddStates(351, 356); }
                   break;
-               case 95:
+               case 73:
                   if ((0x100003600L & l) != 0L)
-                     { jjCheckNAddStates(362, 367); }
+                     { jjCheckNAddStates(357, 362); }
                   break;
-               case 96:
+               case 74:
                   if (curChar == 42)
-                     { jjCheckNAddTwoStates(97, 98); }
+                     { jjCheckNAddTwoStates(75, 76); }
                   break;
-               case 97:
+               case 75:
                   if ((0xfffffbffffffffffL & l) != 0L)
-                     { jjCheckNAddTwoStates(97, 98); }
+                     { jjCheckNAddTwoStates(75, 76); }
                   break;
-               case 98:
+               case 76:
                   if (curChar == 42)
-                     { jjCheckNAddStates(368, 370); }
+                     { jjCheckNAddStates(363, 365); }
                   break;
-               case 99:
+               case 77:
                   if ((0xffff7bffffffffffL & l) != 0L)
-                     { jjCheckNAddTwoStates(100, 101); }
+                     { jjCheckNAddTwoStates(78, 79); }
                   break;
-               case 100:
+               case 78:
                   if ((0xfffffbffffffffffL & l) != 0L)
-                     { jjCheckNAddTwoStates(100, 101); }
+                     { jjCheckNAddTwoStates(78, 79); }
                   break;
-               case 101:
+               case 79:
                   if (curChar == 42)
-                     { jjCheckNAddStates(371, 373); }
+                     { jjCheckNAddStates(366, 368); }
                   break;
-               case 102:
+               case 80:
                   if (curChar == 47)
-                     { jjCheckNAddStates(362, 367); }
+                     { jjCheckNAddStates(357, 362); }
                   break;
-               case 103:
+               case 81:
                   if (curChar == 47)
-                     jjstateSet[jjnewStateCnt++] = 96;
+                     jjstateSet[jjnewStateCnt++] = 74;
                   break;
-               case 104:
+               case 82:
                   if (curChar == 45)
-                     { jjCheckNAddTwoStates(105, 121); }
+                     { jjCheckNAddTwoStates(83, 99); }
                   break;
-               case 106:
+               case 84:
                   if ((0x3ff200000000000L & l) != 0L)
-                     { jjCheckNAddStates(374, 376); }
+                     { jjCheckNAddStates(369, 371); }
                   break;
-               case 107:
+               case 85:
                   if (curChar == 61)
-                     { jjCheckNAddStates(377, 381); }
+                     { jjCheckNAddStates(372, 376); }
                   break;
-               case 108:
+               case 86:
                   if (curChar == 45)
-                     { jjCheckNAddTwoStates(109, 151); }
+                     { jjCheckNAddTwoStates(87, 129); }
                   break;
-               case 110:
+               case 88:
                   if ((0x3ff200000000000L & l) != 0L)
-                     { jjCheckNAddStates(382, 387); }
+                     { jjCheckNAddStates(377, 382); }
                   break;
-               case 111:
+               case 89:
                   if ((0x100003600L & l) != 0L)
-                     { jjCheckNAddStates(388, 393); }
+                     { jjCheckNAddStates(383, 388); }
                   break;
-               case 112:
+               case 90:
                   if (curChar == 42)
-                     { jjCheckNAddTwoStates(113, 114); }
+                     { jjCheckNAddTwoStates(91, 92); }
                   break;
-               case 113:
+               case 91:
                   if ((0xfffffbffffffffffL & l) != 0L)
-                     { jjCheckNAddTwoStates(113, 114); }
+                     { jjCheckNAddTwoStates(91, 92); }
                   break;
-               case 114:
+               case 92:
                   if (curChar == 42)
-                     { jjCheckNAddStates(394, 396); }
+                     { jjCheckNAddStates(389, 391); }
                   break;
-               case 115:
+               case 93:
                   if ((0xffff7bffffffffffL & l) != 0L)
-                     { jjCheckNAddTwoStates(116, 117); }
+                     { jjCheckNAddTwoStates(94, 95); }
                   break;
-               case 116:
+               case 94:
                   if ((0xfffffbffffffffffL & l) != 0L)
-                     { jjCheckNAddTwoStates(116, 117); }
+                     { jjCheckNAddTwoStates(94, 95); }
                   break;
-               case 117:
+               case 95:
                   if (curChar == 42)
-                     { jjCheckNAddStates(397, 399); }
+                     { jjCheckNAddStates(392, 394); }
                   break;
-               case 118:
+               case 96:
                   if (curChar == 47)
-                     { jjCheckNAddStates(388, 393); }
+                     { jjCheckNAddStates(383, 388); }
                   break;
-               case 119:
+               case 97:
                   if (curChar == 47)
-                     jjstateSet[jjnewStateCnt++] = 112;
+                     jjstateSet[jjnewStateCnt++] = 90;
                   break;
-               case 120:
-                  if (curChar == 62 && kind > 143)
-                     kind = 143;
+               case 98:
+                  if (curChar == 62 && kind > 144)
+                     kind = 144;
                   break;
-               case 122:
+               case 100:
                   if ((0xfc00ffffffffcbffL & l) != 0L)
-                     { jjCheckNAddStates(374, 376); }
+                     { jjCheckNAddStates(369, 371); }
                   break;
-               case 124:
+               case 102:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(400, 405); }
+                     { jjCheckNAddStates(395, 400); }
                   break;
-               case 125:
+               case 103:
                   if (curChar == 10)
-                     { jjCheckNAddStates(374, 376); }
+                     { jjCheckNAddStates(369, 371); }
                   break;
-               case 126:
-               case 134:
+               case 104:
+               case 112:
                   if (curChar == 13)
-                     { jjCheckNAdd(125); }
+                     { jjCheckNAdd(103); }
                   break;
-               case 127:
+               case 105:
                   if ((0x100003600L & l) != 0L)
-                     { jjCheckNAddStates(374, 376); }
+                     { jjCheckNAddStates(369, 371); }
                   break;
-               case 128:
+               case 106:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(406, 414); }
+                     { jjCheckNAddStates(401, 409); }
                   break;
-               case 129:
+               case 107:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(415, 419); }
+                     { jjCheckNAddStates(410, 414); }
                   break;
-               case 130:
+               case 108:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(420, 425); }
+                     { jjCheckNAddStates(415, 420); }
                   break;
-               case 131:
+               case 109:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(426, 432); }
+                     { jjCheckNAddStates(421, 427); }
                   break;
-               case 132:
+               case 110:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(433, 440); }
+                     { jjCheckNAddStates(428, 435); }
                   break;
-               case 133:
+               case 111:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(441, 446); }
+                     { jjCheckNAddStates(436, 441); }
                   break;
-               case 135:
+               case 113:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(447, 455); }
+                     { jjCheckNAddStates(442, 450); }
                   break;
-               case 136:
+               case 114:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(456, 460); }
+                     { jjCheckNAddStates(451, 455); }
                   break;
-               case 137:
+               case 115:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(461, 466); }
+                     { jjCheckNAddStates(456, 461); }
                   break;
-               case 138:
+               case 116:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(467, 473); }
+                     { jjCheckNAddStates(462, 468); }
                   break;
-               case 139:
+               case 117:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(474, 481); }
+                     { jjCheckNAddStates(469, 476); }
                   break;
-               case 141:
+               case 119:
                   if ((0xfc00ffffffffcbffL & l) != 0L)
-                     { jjCheckNAddStates(382, 387); }
+                     { jjCheckNAddStates(377, 382); }
                   break;
-               case 142:
+               case 120:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(482, 489); }
+                     { jjCheckNAddStates(477, 484); }
                   break;
-               case 143:
+               case 121:
                   if (curChar == 10)
-                     { jjCheckNAddStates(382, 387); }
+                     { jjCheckNAddStates(377, 382); }
                   break;
-               case 144:
-               case 153:
+               case 122:
+               case 131:
                   if (curChar == 13)
-                     { jjCheckNAdd(143); }
+                     { jjCheckNAdd(121); }
                   break;
-               case 145:
+               case 123:
                   if ((0x100003600L & l) != 0L)
-                     { jjCheckNAddStates(490, 498); }
+                     { jjCheckNAddStates(485, 493); }
                   break;
-               case 146:
+               case 124:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(499, 509); }
+                     { jjCheckNAddStates(494, 504); }
                   break;
-               case 147:
+               case 125:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(510, 516); }
+                     { jjCheckNAddStates(505, 511); }
                   break;
-               case 148:
+               case 126:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(517, 524); }
+                     { jjCheckNAddStates(512, 519); }
                   break;
-               case 149:
+               case 127:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(525, 533); }
+                     { jjCheckNAddStates(520, 528); }
                   break;
-               case 150:
+               case 128:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(534, 543); }
+                     { jjCheckNAddStates(529, 538); }
                   break;
-               case 152:
+               case 130:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(544, 551); }
+                     { jjCheckNAddStates(539, 546); }
                   break;
-               case 154:
+               case 132:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(552, 562); }
+                     { jjCheckNAddStates(547, 557); }
                   break;
-               case 155:
+               case 133:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(563, 569); }
+                     { jjCheckNAddStates(558, 564); }
                   break;
-               case 156:
+               case 134:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(570, 577); }
+                     { jjCheckNAddStates(565, 572); }
                   break;
-               case 157:
+               case 135:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(578, 586); }
+                     { jjCheckNAddStates(573, 581); }
                   break;
-               case 158:
+               case 136:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(587, 596); }
+                     { jjCheckNAddStates(582, 591); }
                   break;
-               case 159:
+               case 137:
                   if (curChar == 34)
-                     { jjCheckNAddStates(597, 599); }
+                     { jjCheckNAddStates(592, 594); }
                   break;
-               case 160:
+               case 138:
                   if ((0xfffffffbffffcbffL & l) != 0L)
-                     { jjCheckNAddStates(597, 599); }
+                     { jjCheckNAddStates(592, 594); }
                   break;
-               case 161:
+               case 139:
                   if (curChar == 34)
-                     { jjCheckNAddStates(600, 604); }
+                     { jjCheckNAddStates(595, 599); }
                   break;
-               case 163:
+               case 141:
                   if ((0x3400L & l) != 0L)
-                     { jjCheckNAddStates(597, 599); }
+                     { jjCheckNAddStates(592, 594); }
                   break;
-               case 164:
+               case 142:
                   if (curChar == 10)
-                     { jjCheckNAddStates(597, 599); }
+                     { jjCheckNAddStates(592, 594); }
                   break;
-               case 165:
-               case 168:
+               case 143:
+               case 146:
                   if (curChar == 13)
-                     { jjCheckNAdd(164); }
+                     { jjCheckNAdd(142); }
                   break;
-               case 166:
+               case 144:
                   if ((0xfc00ffffffffcbffL & l) != 0L)
-                     { jjCheckNAddStates(597, 599); }
+                     { jjCheckNAddStates(592, 594); }
                   break;
-               case 167:
+               case 145:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(605, 610); }
+                     { jjCheckNAddStates(600, 605); }
                   break;
-               case 169:
+               case 147:
                   if ((0x100003600L & l) != 0L)
-                     { jjCheckNAddStates(597, 599); }
+                     { jjCheckNAddStates(592, 594); }
                   break;
-               case 170:
+               case 148:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(611, 619); }
+                     { jjCheckNAddStates(606, 614); }
                   break;
-               case 171:
+               case 149:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(620, 624); }
+                     { jjCheckNAddStates(615, 619); }
                   break;
-               case 172:
+               case 150:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(625, 630); }
+                     { jjCheckNAddStates(620, 625); }
                   break;
-               case 173:
+               case 151:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(631, 637); }
+                     { jjCheckNAddStates(626, 632); }
                   break;
-               case 174:
+               case 152:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(638, 645); }
+                     { jjCheckNAddStates(633, 640); }
                   break;
-               case 175:
+               case 153:
                   if (curChar == 39)
-                     { jjCheckNAddStates(646, 648); }
+                     { jjCheckNAddStates(641, 643); }
                   break;
-               case 176:
+               case 154:
                   if ((0xffffff7fffffcbffL & l) != 0L)
-                     { jjCheckNAddStates(646, 648); }
+                     { jjCheckNAddStates(641, 643); }
                   break;
-               case 177:
+               case 155:
                   if (curChar == 39)
-                     { jjCheckNAddStates(600, 604); }
+                     { jjCheckNAddStates(595, 599); }
                   break;
-               case 179:
+               case 157:
                   if ((0x3400L & l) != 0L)
-                     { jjCheckNAddStates(646, 648); }
+                     { jjCheckNAddStates(641, 643); }
                   break;
-               case 180:
+               case 158:
                   if (curChar == 10)
-                     { jjCheckNAddStates(646, 648); }
+                     { jjCheckNAddStates(641, 643); }
                   break;
-               case 181:
-               case 184:
+               case 159:
+               case 162:
                   if (curChar == 13)
-                     { jjCheckNAdd(180); }
+                     { jjCheckNAdd(158); }
                   break;
-               case 182:
+               case 160:
                   if ((0xfc00ffffffffcbffL & l) != 0L)
-                     { jjCheckNAddStates(646, 648); }
+                     { jjCheckNAddStates(641, 643); }
                   break;
-               case 183:
+               case 161:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(649, 654); }
+                     { jjCheckNAddStates(644, 649); }
                   break;
-               case 185:
+               case 163:
                   if ((0x100003600L & l) != 0L)
-                     { jjCheckNAddStates(646, 648); }
+                     { jjCheckNAddStates(641, 643); }
                   break;
-               case 186:
+               case 164:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(655, 663); }
+                     { jjCheckNAddStates(650, 658); }
                   break;
-               case 187:
+               case 165:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(664, 668); }
+                     { jjCheckNAddStates(659, 663); }
                   break;
-               case 188:
+               case 166:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(669, 674); }
+                     { jjCheckNAddStates(664, 669); }
                   break;
-               case 189:
+               case 167:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(675, 681); }
+                     { jjCheckNAddStates(670, 676); }
                   break;
-               case 190:
+               case 168:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(682, 689); }
+                     { jjCheckNAddStates(677, 684); }
                   break;
-               case 192:
+               case 170:
                   if ((0xfc00ffffffffcbffL & l) != 0L)
-                     { jjCheckNAddStates(356, 361); }
+                     { jjCheckNAddStates(351, 356); }
                   break;
-               case 193:
+               case 171:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(690, 697); }
+                     { jjCheckNAddStates(685, 692); }
                   break;
-               case 194:
+               case 172:
                   if (curChar == 10)
-                     { jjCheckNAddStates(356, 361); }
+                     { jjCheckNAddStates(351, 356); }
                   break;
-               case 195:
-               case 204:
+               case 173:
+               case 182:
                   if (curChar == 13)
-                     { jjCheckNAdd(194); }
+                     { jjCheckNAdd(172); }
                   break;
-               case 196:
+               case 174:
                   if ((0x100003600L & l) != 0L)
-                     { jjCheckNAddStates(698, 706); }
+                     { jjCheckNAddStates(693, 701); }
                   break;
-               case 197:
+               case 175:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(707, 717); }
+                     { jjCheckNAddStates(702, 712); }
                   break;
-               case 198:
+               case 176:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(718, 724); }
+                     { jjCheckNAddStates(713, 719); }
                   break;
-               case 199:
+               case 177:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(725, 732); }
+                     { jjCheckNAddStates(720, 727); }
                   break;
-               case 200:
+               case 178:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(733, 741); }
+                     { jjCheckNAddStates(728, 736); }
                   break;
-               case 201:
+               case 179:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(742, 751); }
+                     { jjCheckNAddStates(737, 746); }
                   break;
-               case 203:
+               case 181:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(752, 759); }
+                     { jjCheckNAddStates(747, 754); }
                   break;
-               case 205:
+               case 183:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(760, 770); }
+                     { jjCheckNAddStates(755, 765); }
                   break;
-               case 206:
+               case 184:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(771, 777); }
+                     { jjCheckNAddStates(766, 772); }
                   break;
-               case 207:
+               case 185:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(778, 785); }
+                     { jjCheckNAddStates(773, 780); }
                   break;
-               case 208:
+               case 186:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(786, 794); }
+                     { jjCheckNAddStates(781, 789); }
                   break;
-               case 209:
+               case 187:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(795, 804); }
+                     { jjCheckNAddStates(790, 799); }
                   break;
-               case 216:
+               case 194:
                   if (curChar == 33)
-                     jjstateSet[jjnewStateCnt++] = 215;
+                     jjstateSet[jjnewStateCnt++] = 193;
                   break;
-               case 217:
+               case 195:
                   if (curChar == 47)
-                     { jjCheckNAddStates(805, 808); }
+                     { jjCheckNAddStates(800, 803); }
                   break;
-               case 218:
+               case 196:
                   if ((0x100003600L & l) != 0L)
-                     { jjCheckNAddStates(809, 813); }
+                     { jjCheckNAddStates(804, 808); }
                   break;
-               case 219:
+               case 197:
                   if (curChar == 42)
-                     { jjCheckNAddTwoStates(220, 221); }
+                     { jjCheckNAddTwoStates(198, 199); }
                   break;
-               case 220:
+               case 198:
                   if ((0xfffffbffffffffffL & l) != 0L)
-                     { jjCheckNAddTwoStates(220, 221); }
+                     { jjCheckNAddTwoStates(198, 199); }
                   break;
-               case 221:
+               case 199:
                   if (curChar == 42)
-                     { jjCheckNAddStates(814, 816); }
+                     { jjCheckNAddStates(809, 811); }
                   break;
-               case 222:
+               case 200:
                   if ((0xffff7bffffffffffL & l) != 0L)
-                     { jjCheckNAddTwoStates(223, 224); }
+                     { jjCheckNAddTwoStates(201, 202); }
                   break;
-               case 223:
+               case 201:
                   if ((0xfffffbffffffffffL & l) != 0L)
-                     { jjCheckNAddTwoStates(223, 224); }
+                     { jjCheckNAddTwoStates(201, 202); }
                   break;
-               case 224:
+               case 202:
                   if (curChar == 42)
-                     { jjCheckNAddStates(817, 819); }
+                     { jjCheckNAddStates(812, 814); }
                   break;
-               case 225:
+               case 203:
                   if (curChar == 47)
-                     { jjCheckNAddStates(809, 813); }
+                     { jjCheckNAddStates(804, 808); }
                   break;
-               case 226:
+               case 204:
                   if (curChar == 47)
-                     jjstateSet[jjnewStateCnt++] = 219;
+                     jjstateSet[jjnewStateCnt++] = 197;
                   break;
-               case 227:
+               case 205:
                   if (curChar == 45)
-                     { jjCheckNAddTwoStates(228, 251); }
+                     { jjCheckNAddTwoStates(206, 229); }
                   break;
-               case 229:
+               case 207:
                   if ((0x3ff200000000000L & l) != 0L)
-                     { jjCheckNAddStates(820, 823); }
+                     { jjCheckNAddStates(815, 818); }
                   break;
-               case 230:
+               case 208:
                   if ((0x100003600L & l) != 0L)
-                     { jjCheckNAddStates(824, 826); }
+                     { jjCheckNAddStates(819, 821); }
                   break;
-               case 231:
+               case 209:
                   if (curChar == 42)
-                     { jjCheckNAddTwoStates(232, 233); }
+                     { jjCheckNAddTwoStates(210, 211); }
                   break;
-               case 232:
+               case 210:
                   if ((0xfffffbffffffffffL & l) != 0L)
-                     { jjCheckNAddTwoStates(232, 233); }
+                     { jjCheckNAddTwoStates(210, 211); }
                   break;
-               case 233:
+               case 211:
                   if (curChar == 42)
-                     { jjCheckNAddStates(827, 829); }
+                     { jjCheckNAddStates(822, 824); }
                   break;
-               case 234:
+               case 212:
                   if ((0xffff7bffffffffffL & l) != 0L)
-                     { jjCheckNAddTwoStates(235, 236); }
+                     { jjCheckNAddTwoStates(213, 214); }
                   break;
-               case 235:
+               case 213:
                   if ((0xfffffbffffffffffL & l) != 0L)
-                     { jjCheckNAddTwoStates(235, 236); }
+                     { jjCheckNAddTwoStates(213, 214); }
                   break;
-               case 236:
+               case 214:
                   if (curChar == 42)
-                     { jjCheckNAddStates(830, 832); }
+                     { jjCheckNAddStates(825, 827); }
                   break;
-               case 237:
+               case 215:
                   if (curChar == 47)
-                     { jjCheckNAddStates(824, 826); }
+                     { jjCheckNAddStates(819, 821); }
                   break;
-               case 238:
+               case 216:
                   if (curChar == 47)
-                     jjstateSet[jjnewStateCnt++] = 231;
+                     jjstateSet[jjnewStateCnt++] = 209;
                   break;
-               case 239:
-                  if (curChar == 62 && kind > 144)
-                     kind = 144;
+               case 217:
+                  if (curChar == 62 && kind > 145)
+                     kind = 145;
                   break;
-               case 241:
+               case 219:
                   if ((0xfc00ffffffffcbffL & l) != 0L)
-                     { jjCheckNAddStates(820, 823); }
+                     { jjCheckNAddStates(815, 818); }
                   break;
-               case 242:
+               case 220:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(833, 838); }
+                     { jjCheckNAddStates(828, 833); }
                   break;
-               case 243:
+               case 221:
                   if (curChar == 10)
-                     { jjCheckNAddStates(820, 823); }
+                     { jjCheckNAddStates(815, 818); }
                   break;
-               case 244:
-               case 253:
+               case 222:
+               case 231:
                   if (curChar == 13)
-                     { jjCheckNAdd(243); }
+                     { jjCheckNAdd(221); }
                   break;
-               case 245:
+               case 223:
                   if ((0x100003600L & l) != 0L)
-                     { jjCheckNAddStates(839, 844); }
+                     { jjCheckNAddStates(834, 839); }
                   break;
-               case 246:
+               case 224:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(845, 853); }
+                     { jjCheckNAddStates(840, 848); }
                   break;
-               case 247:
+               case 225:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(854, 858); }
+                     { jjCheckNAddStates(849, 853); }
                   break;
-               case 248:
+               case 226:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(859, 864); }
+                     { jjCheckNAddStates(854, 859); }
                   break;
-               case 249:
+               case 227:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(865, 871); }
+                     { jjCheckNAddStates(860, 866); }
                   break;
-               case 250:
+               case 228:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(872, 879); }
+                     { jjCheckNAddStates(867, 874); }
                   break;
-               case 252:
+               case 230:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(880, 885); }
+                     { jjCheckNAddStates(875, 880); }
                   break;
-               case 254:
+               case 232:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(886, 894); }
+                     { jjCheckNAddStates(881, 889); }
                   break;
-               case 255:
+               case 233:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(895, 899); }
+                     { jjCheckNAddStates(890, 894); }
                   break;
-               case 256:
+               case 234:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(900, 905); }
+                     { jjCheckNAddStates(895, 900); }
                   break;
-               case 257:
+               case 235:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(906, 912); }
+                     { jjCheckNAddStates(901, 907); }
                   break;
-               case 258:
+               case 236:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(913, 920); }
+                     { jjCheckNAddStates(908, 915); }
                   break;
-               case 259:
+               case 237:
                   if (curChar == 60)
-                     jjstateSet[jjnewStateCnt++] = 217;
+                     jjstateSet[jjnewStateCnt++] = 195;
                   break;
-               case 260:
+               case 247:
                   if (curChar == 45)
-                     { jjAddStates(258, 259); }
+                     { jjAddStates(255, 256); }
                   break;
-               case 265:
+               case 248:
+                  if (curChar == 40 && kind > 135)
+                     kind = 135;
+                  break;
+               case 253:
                   if (curChar == 45)
-                     jjstateSet[jjnewStateCnt++] = 264;
+                     jjstateSet[jjnewStateCnt++] = 252;
                   break;
-               case 273:
+               case 261:
                   if (curChar == 45)
-                     jjstateSet[jjnewStateCnt++] = 272;
+                     jjstateSet[jjnewStateCnt++] = 260;
                   break;
-               case 280:
+               case 268:
                   if ((0x100003600L & l) == 0L)
                      break;
                   if (kind > 21)
                      kind = 21;
-                  { jjCheckNAddStates(172, 197); }
+                  { jjCheckNAddStates(174, 199); }
                   break;
-               case 281:
+               case 269:
                   if (curChar == 42)
-                     { jjCheckNAddTwoStates(282, 283); }
+                     { jjCheckNAddTwoStates(270, 271); }
                   break;
-               case 282:
+               case 270:
                   if ((0xfffffbffffffffffL & l) != 0L)
-                     { jjCheckNAddTwoStates(282, 283); }
+                     { jjCheckNAddTwoStates(270, 271); }
                   break;
-               case 283:
+               case 271:
                   if (curChar == 42)
-                     { jjCheckNAddStates(921, 923); }
+                     { jjCheckNAddStates(916, 918); }
                   break;
-               case 284:
+               case 272:
                   if ((0xffff7bffffffffffL & l) != 0L)
-                     { jjCheckNAddTwoStates(285, 286); }
+                     { jjCheckNAddTwoStates(273, 274); }
                   break;
-               case 285:
+               case 273:
                   if ((0xfffffbffffffffffL & l) != 0L)
-                     { jjCheckNAddTwoStates(285, 286); }
+                     { jjCheckNAddTwoStates(273, 274); }
                   break;
-               case 286:
+               case 274:
                   if (curChar == 42)
-                     { jjCheckNAddStates(924, 926); }
+                     { jjCheckNAddStates(919, 921); }
                   break;
-               case 287:
+               case 275:
                   if (curChar != 47)
                      break;
                   if (kind > 21)
                      kind = 21;
-                  { jjCheckNAddTwoStates(288, 289); }
+                  { jjCheckNAddTwoStates(276, 277); }
                   break;
-               case 288:
+               case 276:
                   if (curChar == 47)
-                     jjstateSet[jjnewStateCnt++] = 281;
+                     jjstateSet[jjnewStateCnt++] = 269;
                   break;
-               case 289:
+               case 277:
                   if ((0x100003600L & l) == 0L)
                      break;
                   if (kind > 21)
                      kind = 21;
-                  { jjCheckNAddTwoStates(288, 289); }
+                  { jjCheckNAddTwoStates(276, 277); }
                   break;
-               case 290:
+               case 278:
                   if (curChar == 42)
-                     { jjCheckNAddTwoStates(291, 292); }
+                     { jjCheckNAddTwoStates(279, 280); }
                   break;
-               case 291:
+               case 279:
                   if ((0xfffffbffffffffffL & l) != 0L)
-                     { jjCheckNAddTwoStates(291, 292); }
+                     { jjCheckNAddTwoStates(279, 280); }
                   break;
-               case 292:
+               case 280:
                   if (curChar == 42)
-                     { jjCheckNAddStates(927, 929); }
+                     { jjCheckNAddStates(922, 924); }
                   break;
-               case 293:
+               case 281:
                   if ((0xffff7bffffffffffL & l) != 0L)
-                     { jjCheckNAddTwoStates(294, 295); }
+                     { jjCheckNAddTwoStates(282, 283); }
                   break;
-               case 294:
+               case 282:
                   if ((0xfffffbffffffffffL & l) != 0L)
-                     { jjCheckNAddTwoStates(294, 295); }
+                     { jjCheckNAddTwoStates(282, 283); }
                   break;
-               case 295:
+               case 283:
                   if (curChar == 42)
-                     { jjCheckNAddStates(930, 932); }
+                     { jjCheckNAddStates(925, 927); }
                   break;
-               case 296:
+               case 284:
                   if (curChar == 47)
-                     { jjCheckNAddStates(933, 935); }
+                     { jjCheckNAddStates(928, 930); }
                   break;
-               case 297:
+               case 285:
                   if (curChar == 47)
-                     jjstateSet[jjnewStateCnt++] = 290;
+                     jjstateSet[jjnewStateCnt++] = 278;
                   break;
-               case 298:
+               case 286:
                   if ((0x100003600L & l) != 0L)
-                     { jjCheckNAddStates(933, 935); }
+                     { jjCheckNAddStates(928, 930); }
                   break;
-               case 300:
+               case 288:
                   if (curChar == 61 && kind > 25)
                      kind = 25;
                   break;
-               case 301:
+               case 289:
                   if (curChar == 42)
-                     { jjCheckNAddTwoStates(302, 303); }
+                     { jjCheckNAddTwoStates(290, 291); }
                   break;
-               case 302:
+               case 290:
                   if ((0xfffffbffffffffffL & l) != 0L)
-                     { jjCheckNAddTwoStates(302, 303); }
+                     { jjCheckNAddTwoStates(290, 291); }
                   break;
-               case 303:
+               case 291:
                   if (curChar == 42)
-                     { jjCheckNAddStates(936, 938); }
+                     { jjCheckNAddStates(931, 933); }
                   break;
-               case 304:
+               case 292:
                   if ((0xffff7bffffffffffL & l) != 0L)
-                     { jjCheckNAddTwoStates(305, 306); }
+                     { jjCheckNAddTwoStates(293, 294); }
                   break;
-               case 305:
+               case 293:
                   if ((0xfffffbffffffffffL & l) != 0L)
-                     { jjCheckNAddTwoStates(305, 306); }
+                     { jjCheckNAddTwoStates(293, 294); }
                   break;
-               case 306:
+               case 294:
                   if (curChar == 42)
-                     { jjCheckNAddStates(939, 941); }
+                     { jjCheckNAddStates(934, 936); }
                   break;
-               case 307:
+               case 295:
                   if (curChar == 47)
-                     { jjCheckNAddStates(942, 944); }
+                     { jjCheckNAddStates(937, 939); }
                   break;
-               case 308:
+               case 296:
                   if (curChar == 47)
-                     jjstateSet[jjnewStateCnt++] = 301;
+                     jjstateSet[jjnewStateCnt++] = 289;
                   break;
-               case 309:
+               case 297:
                   if ((0x100003600L & l) != 0L)
-                     { jjCheckNAddStates(942, 944); }
+                     { jjCheckNAddStates(937, 939); }
                   break;
-               case 310:
+               case 298:
                   if (curChar == 42)
-                     { jjCheckNAddTwoStates(311, 312); }
+                     { jjCheckNAddTwoStates(299, 300); }
                   break;
-               case 311:
+               case 299:
                   if ((0xfffffbffffffffffL & l) != 0L)
-                     { jjCheckNAddTwoStates(311, 312); }
+                     { jjCheckNAddTwoStates(299, 300); }
                   break;
-               case 312:
+               case 300:
                   if (curChar == 42)
-                     { jjCheckNAddStates(945, 947); }
+                     { jjCheckNAddStates(940, 942); }
                   break;
-               case 313:
+               case 301:
                   if ((0xffff7bffffffffffL & l) != 0L)
-                     { jjCheckNAddTwoStates(314, 315); }
+                     { jjCheckNAddTwoStates(302, 303); }
                   break;
-               case 314:
+               case 302:
                   if ((0xfffffbffffffffffL & l) != 0L)
-                     { jjCheckNAddTwoStates(314, 315); }
+                     { jjCheckNAddTwoStates(302, 303); }
                   break;
-               case 315:
+               case 303:
                   if (curChar == 42)
-                     { jjCheckNAddStates(948, 950); }
+                     { jjCheckNAddStates(943, 945); }
                   break;
-               case 316:
+               case 304:
                   if (curChar == 47)
-                     { jjCheckNAddStates(951, 953); }
+                     { jjCheckNAddStates(946, 948); }
                   break;
-               case 317:
+               case 305:
                   if (curChar == 47)
-                     jjstateSet[jjnewStateCnt++] = 310;
+                     jjstateSet[jjnewStateCnt++] = 298;
                   break;
-               case 318:
+               case 306:
                   if ((0x100003600L & l) != 0L)
-                     { jjCheckNAddStates(951, 953); }
+                     { jjCheckNAddStates(946, 948); }
                   break;
-               case 319:
+               case 307:
                   if (curChar == 42)
-                     { jjCheckNAddTwoStates(320, 321); }
+                     { jjCheckNAddTwoStates(308, 309); }
                   break;
-               case 320:
+               case 308:
                   if ((0xfffffbffffffffffL & l) != 0L)
-                     { jjCheckNAddTwoStates(320, 321); }
+                     { jjCheckNAddTwoStates(308, 309); }
                   break;
-               case 321:
+               case 309:
                   if (curChar == 42)
-                     { jjCheckNAddStates(954, 956); }
+                     { jjCheckNAddStates(949, 951); }
                   break;
-               case 322:
+               case 310:
                   if ((0xffff7bffffffffffL & l) != 0L)
-                     { jjCheckNAddTwoStates(323, 324); }
+                     { jjCheckNAddTwoStates(311, 312); }
                   break;
-               case 323:
+               case 311:
                   if ((0xfffffbffffffffffL & l) != 0L)
-                     { jjCheckNAddTwoStates(323, 324); }
+                     { jjCheckNAddTwoStates(311, 312); }
                   break;
-               case 324:
+               case 312:
                   if (curChar == 42)
-                     { jjCheckNAddStates(957, 959); }
+                     { jjCheckNAddStates(952, 954); }
                   break;
-               case 325:
+               case 313:
                   if (curChar == 47)
-                     { jjCheckNAddStates(960, 962); }
+                     { jjCheckNAddStates(955, 957); }
                   break;
-               case 326:
+               case 314:
                   if (curChar == 47)
-                     jjstateSet[jjnewStateCnt++] = 319;
+                     jjstateSet[jjnewStateCnt++] = 307;
                   break;
-               case 327:
+               case 315:
                   if ((0x100003600L & l) != 0L)
-                     { jjCheckNAddStates(960, 962); }
+                     { jjCheckNAddStates(955, 957); }
                   break;
-               case 328:
+               case 316:
                   if (curChar == 42)
-                     { jjCheckNAddTwoStates(329, 330); }
+                     { jjCheckNAddTwoStates(317, 318); }
                   break;
-               case 329:
+               case 317:
                   if ((0xfffffbffffffffffL & l) != 0L)
-                     { jjCheckNAddTwoStates(329, 330); }
+                     { jjCheckNAddTwoStates(317, 318); }
                   break;
-               case 330:
+               case 318:
                   if (curChar == 42)
-                     { jjCheckNAddStates(963, 965); }
+                     { jjCheckNAddStates(958, 960); }
                   break;
-               case 331:
+               case 319:
                   if ((0xffff7bffffffffffL & l) != 0L)
-                     { jjCheckNAddTwoStates(332, 333); }
+                     { jjCheckNAddTwoStates(320, 321); }
                   break;
-               case 332:
+               case 320:
                   if ((0xfffffbffffffffffL & l) != 0L)
-                     { jjCheckNAddTwoStates(332, 333); }
+                     { jjCheckNAddTwoStates(320, 321); }
                   break;
-               case 333:
+               case 321:
                   if (curChar == 42)
-                     { jjCheckNAddStates(966, 968); }
+                     { jjCheckNAddStates(961, 963); }
                   break;
-               case 334:
+               case 322:
                   if (curChar == 47)
-                     { jjCheckNAddStates(969, 971); }
+                     { jjCheckNAddStates(964, 966); }
                   break;
-               case 335:
+               case 323:
                   if (curChar == 47)
-                     jjstateSet[jjnewStateCnt++] = 328;
+                     jjstateSet[jjnewStateCnt++] = 316;
                   break;
-               case 336:
+               case 324:
                   if ((0x100003600L & l) != 0L)
-                     { jjCheckNAddStates(969, 971); }
+                     { jjCheckNAddStates(964, 966); }
                   break;
-               case 337:
+               case 325:
                   if (curChar == 42)
-                     { jjCheckNAddTwoStates(338, 339); }
+                     { jjCheckNAddTwoStates(326, 327); }
                   break;
-               case 338:
+               case 326:
                   if ((0xfffffbffffffffffL & l) != 0L)
-                     { jjCheckNAddTwoStates(338, 339); }
+                     { jjCheckNAddTwoStates(326, 327); }
                   break;
-               case 339:
+               case 327:
                   if (curChar == 42)
-                     { jjCheckNAddStates(972, 974); }
+                     { jjCheckNAddStates(967, 969); }
                   break;
-               case 340:
+               case 328:
                   if ((0xffff7bffffffffffL & l) != 0L)
-                     { jjCheckNAddTwoStates(341, 342); }
+                     { jjCheckNAddTwoStates(329, 330); }
                   break;
-               case 341:
+               case 329:
                   if ((0xfffffbffffffffffL & l) != 0L)
-                     { jjCheckNAddTwoStates(341, 342); }
+                     { jjCheckNAddTwoStates(329, 330); }
                   break;
-               case 342:
+               case 330:
                   if (curChar == 42)
-                     { jjCheckNAddStates(975, 977); }
+                     { jjCheckNAddStates(970, 972); }
                   break;
-               case 343:
+               case 331:
                   if (curChar == 47)
-                     { jjCheckNAddStates(978, 980); }
+                     { jjCheckNAddStates(973, 975); }
                   break;
-               case 344:
+               case 332:
                   if (curChar == 47)
-                     jjstateSet[jjnewStateCnt++] = 337;
+                     jjstateSet[jjnewStateCnt++] = 325;
                   break;
-               case 345:
+               case 333:
                   if ((0x100003600L & l) != 0L)
-                     { jjCheckNAddStates(978, 980); }
+                     { jjCheckNAddStates(973, 975); }
                   break;
-               case 346:
+               case 334:
                   if (curChar == 42)
-                     { jjCheckNAddTwoStates(347, 348); }
+                     { jjCheckNAddTwoStates(335, 336); }
                   break;
-               case 347:
+               case 335:
                   if ((0xfffffbffffffffffL & l) != 0L)
-                     { jjCheckNAddTwoStates(347, 348); }
+                     { jjCheckNAddTwoStates(335, 336); }
                   break;
-               case 348:
+               case 336:
                   if (curChar == 42)
-                     { jjCheckNAddStates(981, 983); }
+                     { jjCheckNAddStates(976, 978); }
                   break;
-               case 349:
+               case 337:
                   if ((0xffff7bffffffffffL & l) != 0L)
-                     { jjCheckNAddTwoStates(350, 351); }
+                     { jjCheckNAddTwoStates(338, 339); }
                   break;
-               case 350:
+               case 338:
                   if ((0xfffffbffffffffffL & l) != 0L)
-                     { jjCheckNAddTwoStates(350, 351); }
+                     { jjCheckNAddTwoStates(338, 339); }
                   break;
-               case 351:
+               case 339:
                   if (curChar == 42)
-                     { jjCheckNAddStates(984, 986); }
+                     { jjCheckNAddStates(979, 981); }
                   break;
-               case 352:
+               case 340:
                   if (curChar == 47)
-                     { jjCheckNAddStates(987, 989); }
+                     { jjCheckNAddStates(982, 984); }
                   break;
-               case 353:
+               case 341:
                   if (curChar == 47)
-                     jjstateSet[jjnewStateCnt++] = 346;
+                     jjstateSet[jjnewStateCnt++] = 334;
                   break;
-               case 354:
+               case 342:
                   if ((0x100003600L & l) != 0L)
-                     { jjCheckNAddStates(987, 989); }
+                     { jjCheckNAddStates(982, 984); }
                   break;
-               case 356:
+               case 344:
                   if (curChar == 42)
-                     { jjCheckNAddTwoStates(357, 358); }
+                     { jjCheckNAddTwoStates(345, 346); }
                   break;
-               case 357:
+               case 345:
                   if ((0xfffffbffffffffffL & l) != 0L)
-                     { jjCheckNAddTwoStates(357, 358); }
+                     { jjCheckNAddTwoStates(345, 346); }
                   break;
-               case 358:
+               case 346:
                   if (curChar == 42)
-                     { jjCheckNAddStates(990, 992); }
+                     { jjCheckNAddStates(985, 987); }
                   break;
-               case 359:
+               case 347:
                   if ((0xffff7bffffffffffL & l) != 0L)
-                     { jjCheckNAddTwoStates(360, 361); }
+                     { jjCheckNAddTwoStates(348, 349); }
                   break;
-               case 360:
+               case 348:
                   if ((0xfffffbffffffffffL & l) != 0L)
-                     { jjCheckNAddTwoStates(360, 361); }
+                     { jjCheckNAddTwoStates(348, 349); }
                   break;
-               case 361:
+               case 349:
                   if (curChar == 42)
-                     { jjCheckNAddStates(993, 995); }
+                     { jjCheckNAddStates(988, 990); }
                   break;
-               case 362:
+               case 350:
                   if (curChar == 47)
-                     { jjCheckNAddStates(996, 998); }
+                     { jjCheckNAddStates(991, 993); }
                   break;
-               case 363:
+               case 351:
                   if (curChar == 47)
-                     jjstateSet[jjnewStateCnt++] = 356;
+                     jjstateSet[jjnewStateCnt++] = 344;
                   break;
-               case 364:
+               case 352:
                   if ((0x100003600L & l) != 0L)
-                     { jjCheckNAddStates(996, 998); }
+                     { jjCheckNAddStates(991, 993); }
                   break;
-               case 366:
+               case 354:
                   if (curChar != 34)
                      break;
                   if (kind > 40)
                      kind = 40;
-                  { jjCheckNAddStates(253, 257); }
+                  { jjCheckNAddStates(250, 254); }
                   break;
-               case 367:
+               case 355:
                   if ((0xfffffffbffffcbffL & l) != 0L)
-                     { jjCheckNAddStates(999, 1001); }
+                     { jjCheckNAddStates(994, 996); }
                   break;
-               case 368:
+               case 356:
                   if (curChar == 34 && kind > 39)
                      kind = 39;
                   break;
-               case 370:
+               case 358:
                   if ((0x3400L & l) != 0L)
-                     { jjCheckNAddStates(999, 1001); }
+                     { jjCheckNAddStates(994, 996); }
                   break;
-               case 371:
+               case 359:
                   if (curChar == 10)
-                     { jjCheckNAddStates(999, 1001); }
+                     { jjCheckNAddStates(994, 996); }
                   break;
-               case 372:
-               case 375:
+               case 360:
+               case 363:
                   if (curChar == 13)
-                     { jjCheckNAdd(371); }
+                     { jjCheckNAdd(359); }
                   break;
-               case 373:
+               case 361:
                   if ((0xfc00ffffffffcbffL & l) != 0L)
-                     { jjCheckNAddStates(999, 1001); }
+                     { jjCheckNAddStates(994, 996); }
                   break;
-               case 374:
+               case 362:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1002, 1007); }
+                     { jjCheckNAddStates(997, 1002); }
                   break;
-               case 376:
+               case 364:
                   if ((0x100003600L & l) != 0L)
-                     { jjCheckNAddStates(999, 1001); }
+                     { jjCheckNAddStates(994, 996); }
                   break;
-               case 377:
+               case 365:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1008, 1016); }
+                     { jjCheckNAddStates(1003, 1011); }
                   break;
-               case 378:
+               case 366:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1017, 1021); }
+                     { jjCheckNAddStates(1012, 1016); }
                   break;
-               case 379:
+               case 367:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1022, 1027); }
+                     { jjCheckNAddStates(1017, 1022); }
                   break;
-               case 380:
+               case 368:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1028, 1034); }
+                     { jjCheckNAddStates(1023, 1029); }
                   break;
-               case 381:
+               case 369:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1035, 1042); }
+                     { jjCheckNAddStates(1030, 1037); }
                   break;
-               case 382:
+               case 370:
                   if ((0xfffffffbffffcbffL & l) == 0L)
                      break;
                   if (kind > 40)
                      kind = 40;
-                  { jjCheckNAddTwoStates(382, 383); }
+                  { jjCheckNAddTwoStates(370, 371); }
                   break;
-               case 384:
+               case 372:
                   if ((0x3400L & l) == 0L)
                      break;
                   if (kind > 40)
                      kind = 40;
-                  { jjCheckNAddTwoStates(382, 383); }
+                  { jjCheckNAddTwoStates(370, 371); }
                   break;
-               case 385:
+               case 373:
                   if (curChar != 10)
                      break;
                   if (kind > 40)
                      kind = 40;
-                  { jjCheckNAddTwoStates(382, 383); }
+                  { jjCheckNAddTwoStates(370, 371); }
                   break;
-               case 386:
-               case 389:
+               case 374:
+               case 377:
                   if (curChar == 13)
-                     { jjCheckNAdd(385); }
+                     { jjCheckNAdd(373); }
                   break;
-               case 387:
+               case 375:
                   if ((0xfc00ffffffffcbffL & l) == 0L)
                      break;
                   if (kind > 40)
                      kind = 40;
-                  { jjCheckNAddTwoStates(382, 383); }
+                  { jjCheckNAddTwoStates(370, 371); }
                   break;
-               case 388:
+               case 376:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 40)
                      kind = 40;
-                  { jjCheckNAddStates(1043, 1047); }
+                  { jjCheckNAddStates(1038, 1042); }
                   break;
-               case 390:
+               case 378:
                   if ((0x100003600L & l) == 0L)
                      break;
                   if (kind > 40)
                      kind = 40;
-                  { jjCheckNAddTwoStates(382, 383); }
+                  { jjCheckNAddTwoStates(370, 371); }
                   break;
-               case 391:
+               case 379:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 40)
                      kind = 40;
-                  { jjCheckNAddStates(1048, 1055); }
+                  { jjCheckNAddStates(1043, 1050); }
                   break;
-               case 392:
+               case 380:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 40)
                      kind = 40;
-                  { jjCheckNAddStates(1056, 1059); }
+                  { jjCheckNAddStates(1051, 1054); }
                   break;
-               case 393:
+               case 381:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 40)
                      kind = 40;
-                  { jjCheckNAddStates(1060, 1064); }
+                  { jjCheckNAddStates(1055, 1059); }
                   break;
-               case 394:
+               case 382:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 40)
                      kind = 40;
-                  { jjCheckNAddStates(1065, 1070); }
+                  { jjCheckNAddStates(1060, 1065); }
                   break;
-               case 395:
+               case 383:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 40)
                      kind = 40;
-                  { jjCheckNAddStates(1071, 1077); }
+                  { jjCheckNAddStates(1066, 1072); }
                   break;
-               case 396:
+               case 384:
                   if (curChar != 39)
                      break;
                   if (kind > 40)
                      kind = 40;
-                  { jjCheckNAddStates(248, 252); }
+                  { jjCheckNAddStates(245, 249); }
                   break;
-               case 397:
+               case 385:
                   if ((0xffffff7fffffcbffL & l) != 0L)
-                     { jjCheckNAddStates(1078, 1080); }
+                     { jjCheckNAddStates(1073, 1075); }
                   break;
-               case 398:
+               case 386:
                   if (curChar == 39 && kind > 39)
                      kind = 39;
                   break;
-               case 400:
+               case 388:
                   if ((0x3400L & l) != 0L)
-                     { jjCheckNAddStates(1078, 1080); }
+                     { jjCheckNAddStates(1073, 1075); }
                   break;
-               case 401:
+               case 389:
                   if (curChar == 10)
-                     { jjCheckNAddStates(1078, 1080); }
+                     { jjCheckNAddStates(1073, 1075); }
                   break;
-               case 402:
-               case 405:
+               case 390:
+               case 393:
                   if (curChar == 13)
-                     { jjCheckNAdd(401); }
+                     { jjCheckNAdd(389); }
                   break;
-               case 403:
+               case 391:
                   if ((0xfc00ffffffffcbffL & l) != 0L)
-                     { jjCheckNAddStates(1078, 1080); }
+                     { jjCheckNAddStates(1073, 1075); }
                   break;
-               case 404:
+               case 392:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1081, 1086); }
+                     { jjCheckNAddStates(1076, 1081); }
                   break;
-               case 406:
+               case 394:
                   if ((0x100003600L & l) != 0L)
-                     { jjCheckNAddStates(1078, 1080); }
+                     { jjCheckNAddStates(1073, 1075); }
                   break;
-               case 407:
+               case 395:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1087, 1095); }
+                     { jjCheckNAddStates(1082, 1090); }
                   break;
-               case 408:
+               case 396:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1096, 1100); }
+                     { jjCheckNAddStates(1091, 1095); }
                   break;
-               case 409:
+               case 397:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1101, 1106); }
+                     { jjCheckNAddStates(1096, 1101); }
                   break;
-               case 410:
+               case 398:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1107, 1113); }
+                     { jjCheckNAddStates(1102, 1108); }
                   break;
-               case 411:
+               case 399:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1114, 1121); }
+                     { jjCheckNAddStates(1109, 1116); }
                   break;
-               case 412:
+               case 400:
                   if ((0xffffff7fffffcbffL & l) == 0L)
                      break;
                   if (kind > 40)
                      kind = 40;
-                  { jjCheckNAddTwoStates(412, 413); }
+                  { jjCheckNAddTwoStates(400, 401); }
                   break;
-               case 414:
+               case 402:
                   if ((0x3400L & l) == 0L)
                      break;
                   if (kind > 40)
                      kind = 40;
-                  { jjCheckNAddTwoStates(412, 413); }
+                  { jjCheckNAddTwoStates(400, 401); }
                   break;
-               case 415:
+               case 403:
                   if (curChar != 10)
                      break;
                   if (kind > 40)
                      kind = 40;
-                  { jjCheckNAddTwoStates(412, 413); }
+                  { jjCheckNAddTwoStates(400, 401); }
                   break;
-               case 416:
-               case 419:
-                  if (curChar == 13)
-                     { jjCheckNAdd(415); }
+               case 404:
+               case 407:
+                  if (curChar == 13)
+                     { jjCheckNAdd(403); }
                   break;
-               case 417:
+               case 405:
                   if ((0xfc00ffffffffcbffL & l) == 0L)
                      break;
                   if (kind > 40)
                      kind = 40;
-                  { jjCheckNAddTwoStates(412, 413); }
+                  { jjCheckNAddTwoStates(400, 401); }
                   break;
-               case 418:
+               case 406:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 40)
                      kind = 40;
-                  { jjCheckNAddStates(1122, 1126); }
+                  { jjCheckNAddStates(1117, 1121); }
                   break;
-               case 420:
+               case 408:
                   if ((0x100003600L & l) == 0L)
                      break;
                   if (kind > 40)
                      kind = 40;
-                  { jjCheckNAddTwoStates(412, 413); }
+                  { jjCheckNAddTwoStates(400, 401); }
                   break;
-               case 421:
+               case 409:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 40)
                      kind = 40;
-                  { jjCheckNAddStates(1127, 1134); }
+                  { jjCheckNAddStates(1122, 1129); }
                   break;
-               case 422:
+               case 410:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 40)
                      kind = 40;
-                  { jjCheckNAddStates(1135, 1138); }
+                  { jjCheckNAddStates(1130, 1133); }
                   break;
-               case 423:
+               case 411:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 40)
                      kind = 40;
-                  { jjCheckNAddStates(1139, 1143); }
+                  { jjCheckNAddStates(1134, 1138); }
                   break;
-               case 424:
+               case 412:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 40)
                      kind = 40;
-                  { jjCheckNAddStates(1144, 1149); }
+                  { jjCheckNAddStates(1139, 1144); }
                   break;
-               case 425:
+               case 413:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 40)
                      kind = 40;
-                  { jjCheckNAddStates(1150, 1156); }
+                  { jjCheckNAddStates(1145, 1151); }
                   break;
-               case 426:
+               case 414:
                   if (curChar == 45)
-                     { jjAddStates(243, 247); }
+                     { jjAddStates(240, 244); }
                   break;
-               case 428:
+               case 416:
                   if ((0x3ff200000000000L & l) == 0L)
                      break;
                   if (kind > 41)
                      kind = 41;
-                  { jjCheckNAddTwoStates(428, 429); }
+                  { jjCheckNAddTwoStates(416, 417); }
                   break;
-               case 430:
+               case 418:
                   if ((0xfc00ffffffffcbffL & l) == 0L)
                      break;
                   if (kind > 41)
                      kind = 41;
-                  { jjCheckNAddTwoStates(428, 429); }
+                  { jjCheckNAddTwoStates(416, 417); }
                   break;
-               case 431:
+               case 419:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 41)
                      kind = 41;
-                  { jjCheckNAddStates(1157, 1161); }
+                  { jjCheckNAddStates(1152, 1156); }
                   break;
-               case 432:
+               case 420:
                   if (curChar != 10)
                      break;
                   if (kind > 41)
                      kind = 41;
-                  { jjCheckNAddTwoStates(428, 429); }
+                  { jjCheckNAddTwoStates(416, 417); }
                   break;
-               case 433:
-               case 486:
+               case 421:
+               case 474:
                   if (curChar == 13)
-                     { jjCheckNAdd(432); }
+                     { jjCheckNAdd(420); }
                   break;
-               case 434:
+               case 422:
                   if ((0x100003600L & l) == 0L)
                      break;
                   if (kind > 41)
                      kind = 41;
-                  { jjCheckNAddTwoStates(428, 429); }
+                  { jjCheckNAddTwoStates(416, 417); }
                   break;
-               case 435:
+               case 423:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 41)
                      kind = 41;
-                  { jjCheckNAddStates(1162, 1169); }
+                  { jjCheckNAddStates(1157, 1164); }
                   break;
-               case 436:
+               case 424:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 41)
                      kind = 41;
-                  { jjCheckNAddStates(1170, 1173); }
+                  { jjCheckNAddStates(1165, 1168); }
                   break;
-               case 437:
+               case 425:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 41)
                      kind = 41;
-                  { jjCheckNAddStates(1174, 1178); }
+                  { jjCheckNAddStates(1169, 1173); }
                   break;
-               case 438:
+               case 426:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 41)
                      kind = 41;
-                  { jjCheckNAddStates(1179, 1184); }
+                  { jjCheckNAddStates(1174, 1179); }
                   break;
-               case 439:
+               case 427:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 41)
                      kind = 41;
-                  { jjCheckNAddStates(1185, 1191); }
+                  { jjCheckNAddStates(1180, 1186); }
                   break;
-               case 440:
+               case 428:
                   if (curChar != 45)
                      break;
                   if (kind > 45)
                      kind = 45;
-                  { jjAddStates(1192, 1193); }
+                  { jjAddStates(1187, 1188); }
                   break;
-               case 442:
+               case 430:
                   if ((0x3ff200000000000L & l) == 0L)
                      break;
                   if (kind > 45)
                      kind = 45;
-                  { jjCheckNAddTwoStates(442, 443); }
+                  { jjCheckNAddTwoStates(430, 431); }
                   break;
-               case 444:
+               case 432:
                   if ((0xfc00ffffffffcbffL & l) == 0L)
                      break;
                   if (kind > 45)
                      kind = 45;
-                  { jjCheckNAddTwoStates(442, 443); }
+                  { jjCheckNAddTwoStates(430, 431); }
                   break;
-               case 445:
+               case 433:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 45)
                      kind = 45;
-                  { jjCheckNAddStates(1194, 1198); }
+                  { jjCheckNAddStates(1189, 1193); }
                   break;
-               case 446:
+               case 434:
                   if (curChar != 10)
                      break;
                   if (kind > 45)
                      kind = 45;
-                  { jjCheckNAddTwoStates(442, 443); }
+                  { jjCheckNAddTwoStates(430, 431); }
                   break;
-               case 447:
-               case 456:
+               case 435:
+               case 444:
                   if (curChar == 13)
-                     { jjCheckNAdd(446); }
+                     { jjCheckNAdd(434); }
                   break;
-               case 448:
+               case 436:
                   if ((0x100003600L & l) == 0L)
                      break;
                   if (kind > 45)
                      kind = 45;
-                  { jjCheckNAddTwoStates(442, 443); }
+                  { jjCheckNAddTwoStates(430, 431); }
                   break;
-               case 449:
+               case 437:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 45)
                      kind = 45;
-                  { jjCheckNAddStates(1199, 1206); }
+                  { jjCheckNAddStates(1194, 1201); }
                   break;
-               case 450:
+               case 438:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 45)
                      kind = 45;
-                  { jjCheckNAddStates(1207, 1210); }
+                  { jjCheckNAddStates(1202, 1205); }
                   break;
-               case 451:
+               case 439:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 45)
                      kind = 45;
-                  { jjCheckNAddStates(1211, 1215); }
+                  { jjCheckNAddStates(1206, 1210); }
                   break;
-               case 452:
+               case 440:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 45)
                      kind = 45;
-                  { jjCheckNAddStates(1216, 1221); }
+                  { jjCheckNAddStates(1211, 1216); }
                   break;
-               case 453:
+               case 441:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 45)
                      kind = 45;
-                  { jjCheckNAddStates(1222, 1228); }
+                  { jjCheckNAddStates(1217, 1223); }
                   break;
-               case 455:
+               case 443:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 45)
                      kind = 45;
-                  { jjCheckNAddStates(1229, 1233); }
+                  { jjCheckNAddStates(1224, 1228); }
                   break;
-               case 457:
+               case 445:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 45)
                      kind = 45;
-                  { jjCheckNAddStates(1234, 1241); }
+                  { jjCheckNAddStates(1229, 1236); }
                   break;
-               case 458:
+               case 446:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 45)
                      kind = 45;
-                  { jjCheckNAddStates(1242, 1245); }
+                  { jjCheckNAddStates(1237, 1240); }
                   break;
-               case 459:
+               case 447:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 45)
                      kind = 45;
-                  { jjCheckNAddStates(1246, 1250); }
+                  { jjCheckNAddStates(1241, 1245); }
                   break;
-               case 460:
+               case 448:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 45)
                      kind = 45;
-                  { jjCheckNAddStates(1251, 1256); }
+                  { jjCheckNAddStates(1246, 1251); }
                   break;
-               case 461:
+               case 449:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 45)
                      kind = 45;
-                  { jjCheckNAddStates(1257, 1263); }
+                  { jjCheckNAddStates(1252, 1258); }
                   break;
-               case 463:
+               case 451:
                   if ((0x3ff200000000000L & l) != 0L)
-                     { jjCheckNAddStates(1264, 1266); }
+                     { jjCheckNAddStates(1259, 1261); }
                   break;
-               case 464:
-                  if (curChar == 40 && kind > 142)
-                     kind = 142;
+               case 452:
+                  if (curChar == 40 && kind > 143)
+                     kind = 143;
                   break;
-               case 466:
+               case 454:
                   if ((0xfc00ffffffffcbffL & l) != 0L)
-                     { jjCheckNAddStates(1264, 1266); }
+                     { jjCheckNAddStates(1259, 1261); }
                   break;
-               case 467:
+               case 455:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1267, 1272); }
+                     { jjCheckNAddStates(1262, 1267); }
                   break;
-               case 468:
+               case 456:
                   if (curChar == 10)
-                     { jjCheckNAddStates(1264, 1266); }
+                     { jjCheckNAddStates(1259, 1261); }
                   break;
-               case 469:
-               case 478:
+               case 457:
+               case 466:
                   if (curChar == 13)
-                     { jjCheckNAdd(468); }
+                     { jjCheckNAdd(456); }
                   break;
-               case 470:
+               case 458:
                   if ((0x100003600L & l) != 0L)
-                     { jjCheckNAddStates(1264, 1266); }
+                     { jjCheckNAddStates(1259, 1261); }
                   break;
-               case 471:
+               case 459:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1273, 1281); }
+                     { jjCheckNAddStates(1268, 1276); }
                   break;
-               case 472:
+               case 460:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1282, 1286); }
+                     { jjCheckNAddStates(1277, 1281); }
                   break;
-               case 473:
+               case 461:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1287, 1292); }
+                     { jjCheckNAddStates(1282, 1287); }
                   break;
-               case 474:
+               case 462:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1293, 1299); }
+                     { jjCheckNAddStates(1288, 1294); }
                   break;
-               case 475:
+               case 463:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1300, 1307); }
+                     { jjCheckNAddStates(1295, 1302); }
                   break;
-               case 477:
+               case 465:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1308, 1313); }
+                     { jjCheckNAddStates(1303, 1308); }
                   break;
-               case 479:
+               case 467:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1314, 1322); }
+                     { jjCheckNAddStates(1309, 1317); }
                   break;
-               case 480:
+               case 468:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1323, 1327); }
+                     { jjCheckNAddStates(1318, 1322); }
                   break;
-               case 481:
+               case 469:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1328, 1333); }
+                     { jjCheckNAddStates(1323, 1328); }
                   break;
-               case 482:
+               case 470:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1334, 1340); }
+                     { jjCheckNAddStates(1329, 1335); }
                   break;
-               case 483:
+               case 471:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1341, 1348); }
+                     { jjCheckNAddStates(1336, 1343); }
                   break;
-               case 485:
+               case 473:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 41)
                      kind = 41;
-                  { jjCheckNAddStates(1349, 1353); }
+                  { jjCheckNAddStates(1344, 1348); }
                   break;
-               case 487:
+               case 475:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 41)
                      kind = 41;
-                  { jjCheckNAddStates(1354, 1361); }
+                  { jjCheckNAddStates(1349, 1356); }
                   break;
-               case 488:
+               case 476:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 41)
                      kind = 41;
-                  { jjCheckNAddStates(1362, 1365); }
+                  { jjCheckNAddStates(1357, 1360); }
                   break;
-               case 489:
+               case 477:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 41)
                      kind = 41;
-                  { jjCheckNAddStates(1366, 1370); }
+                  { jjCheckNAddStates(1361, 1365); }
                   break;
-               case 490:
+               case 478:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 41)
                      kind = 41;
-                  { jjCheckNAddStates(1371, 1376); }
+                  { jjCheckNAddStates(1366, 1371); }
                   break;
-               case 491:
+               case 479:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 41)
                      kind = 41;
-                  { jjCheckNAddStates(1377, 1383); }
+                  { jjCheckNAddStates(1372, 1378); }
                   break;
-               case 493:
+               case 481:
                   if (curChar == 35)
-                     { jjCheckNAddStates(238, 242); }
+                     { jjCheckNAddStates(235, 239); }
                   break;
-               case 494:
+               case 482:
                   if (curChar == 45)
-                     { jjCheckNAddTwoStates(495, 508); }
+                     { jjCheckNAddTwoStates(483, 496); }
                   break;
-               case 496:
+               case 484:
                   if ((0x3ff200000000000L & l) == 0L)
                      break;
                   if (kind > 42)
                      kind = 42;
-                  { jjCheckNAddTwoStates(496, 497); }
+                  { jjCheckNAddTwoStates(484, 485); }
                   break;
-               case 498:
+               case 486:
                   if ((0xfc00ffffffffcbffL & l) == 0L)
                      break;
                   if (kind > 42)
                      kind = 42;
-                  { jjCheckNAddTwoStates(496, 497); }
+                  { jjCheckNAddTwoStates(484, 485); }
                   break;
-               case 499:
+               case 487:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 42)
                      kind = 42;
-                  { jjCheckNAddStates(1384, 1388); }
+                  { jjCheckNAddStates(1379, 1383); }
                   break;
-               case 500:
+               case 488:
                   if (curChar != 10)
                      break;
                   if (kind > 42)
                      kind = 42;
-                  { jjCheckNAddTwoStates(496, 497); }
+                  { jjCheckNAddTwoStates(484, 485); }
                   break;
-               case 501:
-               case 510:
+               case 489:
+               case 498:
                   if (curChar == 13)
-                     { jjCheckNAdd(500); }
+                     { jjCheckNAdd(488); }
                   break;
-               case 502:
+               case 490:
                   if ((0x100003600L & l) == 0L)
                      break;
                   if (kind > 42)
                      kind = 42;
-                  { jjCheckNAddTwoStates(496, 497); }
+                  { jjCheckNAddTwoStates(484, 485); }
                   break;
-               case 503:
+               case 491:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 42)
                      kind = 42;
-                  { jjCheckNAddStates(1389, 1396); }
+                  { jjCheckNAddStates(1384, 1391); }
                   break;
-               case 504:
+               case 492:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 42)
                      kind = 42;
-                  { jjCheckNAddStates(1397, 1400); }
+                  { jjCheckNAddStates(1392, 1395); }
                   break;
-               case 505:
+               case 493:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 42)
                      kind = 42;
-                  { jjCheckNAddStates(1401, 1405); }
+                  { jjCheckNAddStates(1396, 1400); }
                   break;
-               case 506:
+               case 494:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 42)
                      kind = 42;
-                  { jjCheckNAddStates(1406, 1411); }
+                  { jjCheckNAddStates(1401, 1406); }
                   break;
-               case 507:
+               case 495:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 42)
                      kind = 42;
-                  { jjCheckNAddStates(1412, 1418); }
+                  { jjCheckNAddStates(1407, 1413); }
                   break;
-               case 509:
+               case 497:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 42)
                      kind = 42;
-                  { jjCheckNAddStates(1419, 1423); }
+                  { jjCheckNAddStates(1414, 1418); }
                   break;
-               case 511:
+               case 499:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 42)
                      kind = 42;
-                  { jjCheckNAddStates(1424, 1431); }
+                  { jjCheckNAddStates(1419, 1426); }
                   break;
-               case 512:
+               case 500:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 42)
                      kind = 42;
-                  { jjCheckNAddStates(1432, 1435); }
+                  { jjCheckNAddStates(1427, 1430); }
                   break;
-               case 513:
+               case 501:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 42)
                      kind = 42;
-                  { jjCheckNAddStates(1436, 1440); }
+                  { jjCheckNAddStates(1431, 1435); }
                   break;
-               case 514:
+               case 502:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 42)
                      kind = 42;
-                  { jjCheckNAddStates(1441, 1446); }
+                  { jjCheckNAddStates(1436, 1441); }
                   break;
-               case 515:
+               case 503:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 42)
                      kind = 42;
-                  { jjCheckNAddStates(1447, 1453); }
+                  { jjCheckNAddStates(1442, 1448); }
                   break;
-               case 516:
+               case 504:
                   if ((0x3ff200000000000L & l) == 0L)
                      break;
                   if (kind > 43)
                      kind = 43;
-                  { jjCheckNAddTwoStates(516, 517); }
+                  { jjCheckNAddTwoStates(504, 505); }
                   break;
-               case 518:
+               case 506:
                   if ((0xfc00ffffffffcbffL & l) == 0L)
                      break;
                   if (kind > 43)
                      kind = 43;
-                  { jjCheckNAddTwoStates(516, 517); }
+                  { jjCheckNAddTwoStates(504, 505); }
                   break;
-               case 519:
+               case 507:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 43)
                      kind = 43;
-                  { jjCheckNAddStates(1454, 1458); }
+                  { jjCheckNAddStates(1449, 1453); }
                   break;
-               case 520:
+               case 508:
                   if (curChar != 10)
                      break;
                   if (kind > 43)
                      kind = 43;
-                  { jjCheckNAddTwoStates(516, 517); }
+                  { jjCheckNAddTwoStates(504, 505); }
                   break;
-               case 521:
+               case 509:
                   if (curChar == 13)
-                     jjstateSet[jjnewStateCnt++] = 520;
+                     jjstateSet[jjnewStateCnt++] = 508;
                   break;
-               case 522:
+               case 510:
                   if ((0x100003600L & l) == 0L)
                      break;
                   if (kind > 43)
                      kind = 43;
-                  { jjCheckNAddTwoStates(516, 517); }
+                  { jjCheckNAddTwoStates(504, 505); }
                   break;
-               case 523:
+               case 511:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 43)
                      kind = 43;
-                  { jjCheckNAddStates(1459, 1466); }
+                  { jjCheckNAddStates(1454, 1461); }
                   break;
-               case 524:
+               case 512:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 43)
                      kind = 43;
-                  { jjCheckNAddStates(1467, 1470); }
+                  { jjCheckNAddStates(1462, 1465); }
                   break;
-               case 525:
+               case 513:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 43)
                      kind = 43;
-                  { jjCheckNAddStates(1471, 1475); }
+                  { jjCheckNAddStates(1466, 1470); }
                   break;
-               case 526:
+               case 514:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 43)
                      kind = 43;
-                  { jjCheckNAddStates(1476, 1481); }
+                  { jjCheckNAddStates(1471, 1476); }
                   break;
-               case 527:
+               case 515:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 43)
                      kind = 43;
-                  { jjCheckNAddStates(1482, 1488); }
+                  { jjCheckNAddStates(1477, 1483); }
                   break;
-               case 529:
-                  if (curChar == 40)
-                     { jjCheckNAddStates(1489, 1494); }
+               case 517:
+                  if (curChar == 46)
+                     jjstateSet[jjnewStateCnt++] = 518;
+                  break;
+               case 519:
+                  if ((0xfffffdffffffffffL & l) != 0L)
+                     { jjAddStates(1484, 1485); }
+                  break;
+               case 520:
+                  if (curChar == 41 && kind > 44)
+                     kind = 44;
                   break;
                case 530:
+                  if (curChar == 46)
+                     jjstateSet[jjnewStateCnt++] = 529;
+                  break;
+               case 547:
+                  if (curChar == 58)
+                     jjstateSet[jjnewStateCnt++] = 546;
+                  break;
+               case 556:
+                  if (curChar == 40)
+                     { jjCheckNAddStates(1486, 1491); }
+                  break;
+               case 557:
                   if (curChar == 34)
-                     { jjCheckNAddStates(1495, 1497); }
+                     { jjCheckNAddStates(1492, 1494); }
                   break;
-               case 531:
+               case 558:
                   if ((0xfffffffbffffcbffL & l) != 0L)
-                     { jjCheckNAddStates(1495, 1497); }
+                     { jjCheckNAddStates(1492, 1494); }
                   break;
-               case 532:
+               case 559:
                   if (curChar == 34)
-                     { jjCheckNAddTwoStates(533, 542); }
+                     { jjCheckNAddTwoStates(560, 569); }
                   break;
-               case 533:
+               case 560:
                   if ((0x100003600L & l) != 0L)
-                     { jjCheckNAddStates(1498, 1500); }
+                     { jjCheckNAddStates(1495, 1497); }
                   break;
-               case 534:
+               case 561:
                   if (curChar == 42)
-                     { jjCheckNAddTwoStates(535, 536); }
+                     { jjCheckNAddTwoStates(562, 563); }
                   break;
-               case 535:
+               case 562:
                   if ((0xfffffbffffffffffL & l) != 0L)
-                     { jjCheckNAddTwoStates(535, 536); }
+                     { jjCheckNAddTwoStates(562, 563); }
                   break;
-               case 536:
+               case 563:
                   if (curChar == 42)
-                     { jjCheckNAddStates(1501, 1503); }
+                     { jjCheckNAddStates(1498, 1500); }
                   break;
-               case 537:
+               case 564:
                   if ((0xffff7bffffffffffL & l) != 0L)
-                     { jjCheckNAddTwoStates(538, 539); }
+                     { jjCheckNAddTwoStates(565, 566); }
                   break;
-               case 538:
+               case 565:
                   if ((0xfffffbffffffffffL & l) != 0L)
-                     { jjCheckNAddTwoStates(538, 539); }
+                     { jjCheckNAddTwoStates(565, 566); }
                   break;
-               case 539:
+               case 566:
                   if (curChar == 42)
-                     { jjCheckNAddStates(1504, 1506); }
+                     { jjCheckNAddStates(1501, 1503); }
                   break;
-               case 540:
+               case 567:
                   if (curChar == 47)
-                     { jjCheckNAddStates(1498, 1500); }
+                     { jjCheckNAddStates(1495, 1497); }
                   break;
-               case 541:
+               case 568:
                   if (curChar == 47)
-                     jjstateSet[jjnewStateCnt++] = 534;
+                     jjstateSet[jjnewStateCnt++] = 561;
                   break;
-               case 542:
+               case 569:
                   if (curChar == 41 && kind > 60)
                      kind = 60;
                   break;
-               case 544:
+               case 571:
                   if ((0x3400L & l) != 0L)
-                     { jjCheckNAddStates(1495, 1497); }
+                     { jjCheckNAddStates(1492, 1494); }
                   break;
-               case 545:
+               case 572:
                   if (curChar == 10)
-                     { jjCheckNAddStates(1495, 1497); }
+                     { jjCheckNAddStates(1492, 1494); }
                   break;
-               case 546:
-               case 549:
+               case 573:
+               case 576:
                   if (curChar == 13)
-                     { jjCheckNAdd(545); }
+                     { jjCheckNAdd(572); }
                   break;
-               case 547:
+               case 574:
                   if ((0xfc00ffffffffcbffL & l) != 0L)
-                     { jjCheckNAddStates(1495, 1497); }
+                     { jjCheckNAddStates(1492, 1494); }
                   break;
-               case 548:
+               case 575:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1507, 1512); }
+                     { jjCheckNAddStates(1504, 1509); }
                   break;
-               case 550:
+               case 577:
                   if ((0x100003600L & l) != 0L)
-                     { jjCheckNAddStates(1495, 1497); }
+                     { jjCheckNAddStates(1492, 1494); }
                   break;
-               case 551:
+               case 578:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1513, 1521); }
+                     { jjCheckNAddStates(1510, 1518); }
                   break;
-               case 552:
+               case 579:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1522, 1526); }
+                     { jjCheckNAddStates(1519, 1523); }
                   break;
-               case 553:
+               case 580:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1527, 1532); }
+                     { jjCheckNAddStates(1524, 1529); }
                   break;
-               case 554:
+               case 581:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1533, 1539); }
+                     { jjCheckNAddStates(1530, 1536); }
                   break;
-               case 555:
+               case 582:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1540, 1547); }
+                     { jjCheckNAddStates(1537, 1544); }
                   break;
-               case 556:
+               case 583:
                   if (curChar == 39)
-                     { jjCheckNAddStates(1548, 1550); }
+                     { jjCheckNAddStates(1545, 1547); }
                   break;
-               case 557:
+               case 584:
                   if ((0xffffff7fffffcbffL & l) != 0L)
-                     { jjCheckNAddStates(1548, 1550); }
+                     { jjCheckNAddStates(1545, 1547); }
                   break;
-               case 558:
+               case 585:
                   if (curChar == 39)
-                     { jjCheckNAddTwoStates(533, 542); }
+                     { jjCheckNAddTwoStates(560, 569); }
                   break;
-               case 560:
+               case 587:
                   if ((0x3400L & l) != 0L)
-                     { jjCheckNAddStates(1548, 1550); }
+                     { jjCheckNAddStates(1545, 1547); }
                   break;
-               case 561:
+               case 588:
                   if (curChar == 10)
-                     { jjCheckNAddStates(1548, 1550); }
+                     { jjCheckNAddStates(1545, 1547); }
                   break;
-               case 562:
-               case 565:
+               case 589:
+               case 592:
                   if (curChar == 13)
-                     { jjCheckNAdd(561); }
+                     { jjCheckNAdd(588); }
                   break;
-               case 563:
+               case 590:
                   if ((0xfc00ffffffffcbffL & l) != 0L)
-                     { jjCheckNAddStates(1548, 1550); }
+                     { jjCheckNAddStates(1545, 1547); }
                   break;
-               case 564:
+               case 591:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1551, 1556); }
+                     { jjCheckNAddStates(1548, 1553); }
                   break;
-               case 566:
+               case 593:
                   if ((0x100003600L & l) != 0L)
-                     { jjCheckNAddStates(1548, 1550); }
+                     { jjCheckNAddStates(1545, 1547); }
                   break;
-               case 567:
+               case 594:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1557, 1565); }
+                     { jjCheckNAddStates(1554, 1562); }
                   break;
-               case 568:
+               case 595:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1566, 1570); }
+                     { jjCheckNAddStates(1563, 1567); }
                   break;
-               case 569:
+               case 596:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1571, 1576); }
+                     { jjCheckNAddStates(1568, 1573); }
                   break;
-               case 570:
+               case 597:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1577, 1583); }
+                     { jjCheckNAddStates(1574, 1580); }
                   break;
-               case 571:
+               case 598:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1584, 1591); }
+                     { jjCheckNAddStates(1581, 1588); }
                   break;
-               case 572:
+               case 599:
                   if ((0xfffffc7a00000000L & l) != 0L)
-                     { jjCheckNAddStates(1592, 1595); }
+                     { jjCheckNAddStates(1589, 1592); }
                   break;
-               case 574:
+               case 601:
                   if ((0xfc00ffffffffcbffL & l) != 0L)
-                     { jjCheckNAddStates(1592, 1595); }
+                     { jjCheckNAddStates(1589, 1592); }
                   break;
-               case 575:
+               case 602:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1596, 1601); }
+                     { jjCheckNAddStates(1593, 1598); }
                   break;
-               case 576:
+               case 603:
                   if (curChar == 10)
-                     { jjCheckNAddStates(1592, 1595); }
+                     { jjCheckNAddStates(1589, 1592); }
                   break;
-               case 577:
+               case 604:
                   if (curChar == 13)
-                     jjstateSet[jjnewStateCnt++] = 576;
+                     jjstateSet[jjnewStateCnt++] = 603;
                   break;
-               case 578:
+               case 605:
                   if ((0x100003600L & l) != 0L)
-                     { jjCheckNAddStates(1602, 1607); }
+                     { jjCheckNAddStates(1599, 1604); }
                   break;
-               case 579:
+               case 606:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1608, 1616); }
+                     { jjCheckNAddStates(1605, 1613); }
                   break;
-               case 580:
+               case 607:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1617, 1621); }
+                     { jjCheckNAddStates(1614, 1618); }
                   break;
-               case 581:
+               case 608:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1622, 1627); }
+                     { jjCheckNAddStates(1619, 1624); }
                   break;
-               case 582:
+               case 609:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1628, 1634); }
+                     { jjCheckNAddStates(1625, 1631); }
                   break;
-               case 583:
+               case 610:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1635, 1642); }
+                     { jjCheckNAddStates(1632, 1639); }
                   break;
-               case 584:
+               case 611:
                   if ((0x100003600L & l) != 0L)
-                     { jjCheckNAddStates(1643, 1651); }
+                     { jjCheckNAddStates(1640, 1648); }
                   break;
-               case 585:
+               case 612:
                   if (curChar == 42)
-                     { jjCheckNAddTwoStates(586, 587); }
+                     { jjCheckNAddTwoStates(613, 614); }
                   break;
-               case 586:
+               case 613:
                   if ((0xfffffbffffffffffL & l) != 0L)
-                     { jjCheckNAddTwoStates(586, 587); }
+                     { jjCheckNAddTwoStates(613, 614); }
                   break;
-               case 587:
+               case 614:
                   if (curChar == 42)
-                     { jjCheckNAddStates(1652, 1654); }
+                     { jjCheckNAddStates(1649, 1651); }
                   break;
-               case 588:
+               case 615:
                   if ((0xffff7bffffffffffL & l) != 0L)
-                     { jjCheckNAddTwoStates(589, 590); }
+                     { jjCheckNAddTwoStates(616, 617); }
                   break;
-               case 589:
+               case 616:
                   if ((0xfffffbffffffffffL & l) != 0L)
-                     { jjCheckNAddTwoStates(589, 590); }
+                     { jjCheckNAddTwoStates(616, 617); }
                   break;
-               case 590:
+               case 617:
                   if (curChar == 42)
-                     { jjCheckNAddStates(1655, 1657); }
+                     { jjCheckNAddStates(1652, 1654); }
                   break;
-               case 591:
+               case 618:
                   if (curChar == 47)
-                     { jjCheckNAddStates(1658, 1664); }
+                     { jjCheckNAddStates(1655, 1661); }
                   break;
-               case 592:
+               case 619:
                   if (curChar == 47)
-                     jjstateSet[jjnewStateCnt++] = 585;
+                     jjstateSet[jjnewStateCnt++] = 612;
                   break;
-               case 595:
+               case 622:
                   if (curChar == 43)
-                     { jjAddStates(1665, 1666); }
+                     { jjAddStates(1662, 1663); }
                   break;
-               case 596:
+               case 623:
                   if (curChar != 63)
                      break;
                   if (kind > 119)
                      kind = 119;
-                  jjstateSet[jjnewStateCnt++] = 597;
+                  jjstateSet[jjnewStateCnt++] = 624;
                   break;
-               case 597:
+               case 624:
                   if (curChar != 63)
                      break;
                   if (kind > 119)
                      kind = 119;
-                  { jjCheckNAddStates(1667, 1670); }
+                  { jjCheckNAddStates(1664, 1667); }
                   break;
-               case 598:
+               case 625:
                   if (curChar == 63 && kind > 119)
                      kind = 119;
                   break;
-               case 599:
-               case 615:
-               case 619:
-               case 622:
-               case 625:
+               case 626:
+               case 642:
+               case 646:
+               case 649:
+               case 652:
                   if (curChar != 63)
                      break;
                   if (kind > 119)
                      kind = 119;
-                  { jjCheckNAdd(598); }
+                  { jjCheckNAdd(625); }
                   break;
-               case 600:
+               case 627:
                   if (curChar != 63)
                      break;
                   if (kind > 119)
                      kind = 119;
-                  { jjCheckNAddTwoStates(598, 599); }
+                  { jjCheckNAddTwoStates(625, 626); }
                   break;
-               case 601:
+               case 628:
                   if (curChar != 63)
                      break;
                   if (kind > 119)
                      kind = 119;
-                  { jjCheckNAddStates(1671, 1673); }
+                  { jjCheckNAddStates(1668, 1670); }
                   break;
-               case 602:
+               case 629:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 119)
                      kind = 119;
-                  { jjAddStates(1674, 1679); }
+                  { jjAddStates(1671, 1676); }
                   break;
-               case 603:
+               case 630:
                   if ((0x3ff000000000000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 604;
+                     jjstateSet[jjnewStateCnt++] = 631;
                   break;
-               case 604:
+               case 631:
                   if ((0x3ff000000000000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 605;
+                     jjstateSet[jjnewStateCnt++] = 632;
                   break;
-               case 605:
+               case 632:
                   if ((0x3ff000000000000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 606;
+                     jjstateSet[jjnewStateCnt++] = 633;
                   break;
-               case 606:
+               case 633:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAdd(607); }
+                     { jjCheckNAdd(634); }
                   break;
-               case 607:
+               case 634:
                   if ((0x3ff000000000000L & l) != 0L && kind > 119)
                      kind = 119;
                   break;
-               case 608:
+               case 635:
                   if ((0x3ff000000000000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 609;
+                     jjstateSet[jjnewStateCnt++] = 636;
                   break;
-               case 609:
+               case 636:
                   if ((0x3ff000000000000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 610;
+                     jjstateSet[jjnewStateCnt++] = 637;
                   break;
-               case 610:
+               case 637:
                   if ((0x3ff000000000000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 611;
+                     jjstateSet[jjnewStateCnt++] = 638;
                   break;
-               case 611:
+               case 638:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 119)
                      kind = 119;
-                  { jjCheckNAdd(598); }
+                  { jjCheckNAdd(625); }
                   break;
-               case 612:
+               case 639:
                   if ((0x3ff000000000000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 613;
+                     jjstateSet[jjnewStateCnt++] = 640;
                   break;
-               case 613:
+               case 640:
                   if ((0x3ff000000000000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 614;
+                     jjstateSet[jjnewStateCnt++] = 641;
                   break;
-               case 614:
+               case 641:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 119)
                      kind = 119;
-                  jjstateSet[jjnewStateCnt++] = 615;
+                  jjstateSet[jjnewStateCnt++] = 642;
                   break;
-               case 616:
+               case 643:
                   if ((0x3ff000000000000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 617;
+                     jjstateSet[jjnewStateCnt++] = 644;
                   break;
-               case 617:
+               case 644:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 119)
                      kind = 119;
-                  jjstateSet[jjnewStateCnt++] = 618;
+                  jjstateSet[jjnewStateCnt++] = 645;
                   break;
-               case 618:
+               case 645:
                   if (curChar != 63)
                      break;
                   if (kind > 119)
                      kind = 119;
-                  { jjCheckNAddTwoStates(598, 619); }
+                  { jjCheckNAddTwoStates(625, 646); }
                   break;
-               case 620:
+               case 647:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 119)
                      kind = 119;
-                  jjstateSet[jjnewStateCnt++] = 621;
+                  jjstateSet[jjnewStateCnt++] = 648;
                   break;
-               case 621:
+               case 648:
                   if (curChar != 63)
                      break;
                   if (kind > 119)
                      kind = 119;
-                  { jjCheckNAddStates(1680, 1682); }
+                  { jjCheckNAddStates(1677, 1679); }
                   break;
-               case 623:
+               case 650:
                   if (curChar != 63)
                      break;
                   if (kind > 119)
                      kind = 119;
-                  { jjCheckNAddTwoStates(598, 622); }
+                  { jjCheckNAddTwoStates(625, 649); }
                   break;
-               case 624:
+               case 651:
                   if (curChar != 63)
                      break;
                   if (kind > 119)
                      kind = 119;
-                  { jjCheckNAddStates(1683, 1686); }
+                  { jjCheckNAddStates(1680, 1683); }
                   break;
-               case 626:
+               case 653:
                   if (curChar != 63)
                      break;
                   if (kind > 119)
                      kind = 119;
-                  { jjCheckNAddTwoStates(598, 625); }
+                  { jjCheckNAddTwoStates(625, 652); }
                   break;
-               case 627:
+               case 654:
                   if (curChar != 63)
                      break;
                   if (kind > 119)
                      kind = 119;
-                  { jjCheckNAddStates(1687, 1689); }
+                  { jjCheckNAddStates(1684, 1686); }
                   break;
-               case 628:
+               case 655:
                   if (curChar == 43)
-                     jjstateSet[jjnewStateCnt++] = 629;
+                     jjstateSet[jjnewStateCnt++] = 656;
                   break;
-               case 629:
+               case 656:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(630, 636); }
+                     { jjCheckNAddTwoStates(657, 663); }
                   break;
-               case 630:
+               case 657:
                   if (curChar == 45)
-                     jjstateSet[jjnewStateCnt++] = 631;
+                     jjstateSet[jjnewStateCnt++] = 658;
                   break;
-               case 631:
+               case 658:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 119)
                      kind = 119;
-                  jjstateSet[jjnewStateCnt++] = 632;
+                  jjstateSet[jjnewStateCnt++] = 659;
                   break;
-               case 632:
+               case 659:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 119)
                      kind = 119;
-                  { jjCheckNAddStates(1690, 1693); }
+                  { jjCheckNAddStates(1687, 1690); }
                   break;
-               case 633:
+               case 660:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 119)
                      kind = 119;
-                  { jjCheckNAdd(607); }
+                  { jjCheckNAdd(634); }
                   break;
-               case 634:
+               case 661:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 119)
                      kind = 119;
-                  { jjCheckNAddTwoStates(607, 633); }
+                  { jjCheckNAddTwoStates(634, 660); }
                   break;
-               case 635:
+               case 662:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 119)
                      kind = 119;
-                  { jjCheckNAddStates(1694, 1696); }
+                  { jjCheckNAddStates(1691, 1693); }
                   break;
-               case 636:
+               case 663:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1697, 1701); }
+                     { jjCheckNAddStates(1694, 1698); }
                   break;
-               case 637:
+               case 664:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAdd(630); }
+                     { jjCheckNAdd(657); }
                   break;
-               case 638:
+               case 665:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(637, 630); }
+                     { jjCheckNAddTwoStates(664, 657); }
                   break;
-               case 639:
+               case 666:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1702, 1704); }
+                     { jjCheckNAddStates(1699, 1701); }
                   break;
-               case 640:
+               case 667:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1705, 1708); }
+                     { jjCheckNAddStates(1702, 1705); }
                   break;
-               case 641:
+               case 668:
                   if (curChar == 46)
-                     { jjCheckNAddStates(202, 237); }
+                     { jjCheckNAddStates(204, 234); }
                   break;
-               case 642:
+               case 669:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1709, 1711); }
+                     { jjCheckNAddStates(1706, 1709); }
                   break;
-               case 644:
+               case 671:
                   if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(645); }
+                     { jjCheckNAdd(672); }
                   break;
-               case 645:
+               case 672:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(645, 647); }
+                     { jjCheckNAddStates(1710, 1712); }
                   break;
-               case 648:
+               case 676:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1712, 1714); }
+                     { jjCheckNAddStates(1713, 1716); }
                   break;
-               case 650:
+               case 678:
                   if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(651); }
+                     { jjCheckNAdd(679); }
                   break;
-               case 651:
+               case 679:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(651, 653); }
+                     { jjCheckNAddStates(1717, 1719); }
                   break;
-               case 654:
+               case 683:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1715, 1717); }
+                     { jjCheckNAddStates(1720, 1723); }
                   break;
-               case 656:
+               case 685:
                   if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(657); }
+                     { jjCheckNAdd(686); }
                   break;
-               case 657:
+               case 686:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(657, 660); }
+                     { jjCheckNAddStates(1724, 1726); }
                   break;
-               case 661:
+               case 691:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1718, 1720); }
+                     { jjCheckNAddStates(1727, 1730); }
                   break;
-               case 663:
+               case 693:
                   if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(664); }
+                     { jjCheckNAdd(694); }
                   break;
-               case 664:
+               case 694:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(664, 666); }
+                     { jjCheckNAddStates(1731, 1733); }
                   break;
-               case 667:
+               case 698:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1721, 1723); }
+                     { jjCheckNAddStates(1734, 1737); }
                   break;
-               case 669:
+               case 700:
                   if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(670); }
+                     { jjCheckNAdd(701); }
                   break;
-               case 670:
+               case 701:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(670, 672); }
+                     { jjCheckNAddStates(1738, 1740); }
                   break;
-               case 673:
+               case 705:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1724, 1726); }
+                     { jjCheckNAddStates(1741, 1744); }
                   break;
-               case 675:
+               case 707:
                   if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(676); }
+                     { jjCheckNAdd(708); }
                   break;
-               case 676:
+               case 708:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(676, 677); }
+                     { jjCheckNAddStates(1745, 1747); }
                   break;
-               case 678:
+               case 711:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1727, 1729); }
+                     { jjCheckNAddStates(1748, 1751); }
                   break;
-               case 680:
+               case 713:
                   if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(681); }
+                     { jjCheckNAdd(714); }
                   break;
-               case 681:
+               case 714:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(681, 683); }
+                     { jjCheckNAddStates(1752, 1754); }
                   break;
-               case 684:
+               case 718:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1730, 1732); }
+                     { jjCheckNAddStates(1755, 1758); }
                   break;
-               case 686:
+               case 720:
                   if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(687); }
+                     { jjCheckNAdd(721); }
                   break;
-               case 687:
+               case 721:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(687, 689); }
+                     { jjCheckNAddStates(1759, 1761); }
                   break;
-               case 690:
+               case 725:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1733, 1735); }
+                     { jjCheckNAddStates(1762, 1765); }
                   break;
-               case 692:
+               case 727:
                   if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(693); }
+                     { jjCheckNAdd(728); }
                   break;
-               case 693:
+               case 728:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(693, 695); }
+                     { jjCheckNAddStates(1766, 1768); }
                   break;
-               case 696:
-                  if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1736, 1738); }
-                  break;
-               case 698:
-                  if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(699); }
-                  break;
-               case 699:
-                  if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(699, 701); }
-                  break;
-               case 702:
-                  if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1739, 1741); }
-                  break;
-               case 704:
-                  if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(705); }
-                  break;
-               case 705:
-                  if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(705, 707); }
-                  break;
-               case 708:
+               case 732:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1742, 1744); }
+                     { jjCheckNAddStates(1769, 1772); }
                   break;
-               case 710:
+               case 734:
                   if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(711); }
+                     { jjCheckNAdd(735); }
                   break;
-               case 711:
+               case 735:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(711, 713); }
+                     { jjCheckNAddStates(1773, 1775); }
                   break;
-               case 714:
+               case 739:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1745, 1747); }
+                     { jjCheckNAddStates(1776, 1779); }
                   break;
-               case 716:
+               case 741:
                   if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(717); }
+                     { jjCheckNAdd(742); }
                   break;
-               case 717:
+               case 742:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(717, 721); }
+                     { jjCheckNAddStates(1780, 1782); }
                   break;
-               case 722:
+               case 748:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1748, 1750); }
+                     { jjCheckNAddStates(1783, 1786); }
                   break;
-               case 724:
+               case 750:
                   if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(725); }
+                     { jjCheckNAdd(751); }
                   break;
-               case 725:
+               case 751:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(725, 729); }
+                     { jjCheckNAddStates(1787, 1789); }
                   break;
-               case 730:
+               case 757:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1751, 1753); }
+                     { jjCheckNAddStates(1790, 1792); }
                   break;
-               case 732:
+               case 759:
                   if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(733); }
+                     { jjCheckNAdd(760); }
                   break;
-               case 733:
+               case 760:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(733, 735); }
+                     { jjCheckNAddTwoStates(760, 762); }
                   break;
-               case 736:
+               case 763:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1754, 1756); }
+                     { jjCheckNAddStates(1793, 1795); }
                   break;
-               case 738:
+               case 765:
                   if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(739); }
+                     { jjCheckNAdd(766); }
                   break;
-               case 739:
+               case 766:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(739, 740); }
+                     { jjCheckNAddTwoStates(766, 767); }
                   break;
-               case 741:
+               case 768:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1757, 1759); }
+                     { jjCheckNAddStates(1796, 1798); }
                   break;
-               case 743:
+               case 770:
                   if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(744); }
+                     { jjCheckNAdd(771); }
                   break;
-               case 744:
+               case 771:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(744, 745); }
+                     { jjCheckNAddTwoStates(771, 772); }
                   break;
-               case 746:
+               case 773:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1760, 1762); }
+                     { jjCheckNAddStates(1799, 1801); }
                   break;
-               case 748:
+               case 775:
                   if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(749); }
+                     { jjCheckNAdd(776); }
                   break;
-               case 749:
+               case 776:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(749, 751); }
+                     { jjCheckNAddTwoStates(776, 778); }
                   break;
-               case 752:
+               case 779:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1763, 1765); }
+                     { jjCheckNAddStates(1802, 1804); }
                   break;
-               case 754:
+               case 781:
                   if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(755); }
+                     { jjCheckNAdd(782); }
                   break;
-               case 755:
+               case 782:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(755, 757); }
+                     { jjCheckNAddTwoStates(782, 784); }
                   break;
-               case 758:
+               case 785:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1766, 1768); }
+                     { jjCheckNAddStates(1805, 1807); }
                   break;
-               case 760:
+               case 787:
                   if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(761); }
+                     { jjCheckNAdd(788); }
                   break;
-               case 761:
+               case 788:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(761, 763); }
+                     { jjCheckNAddTwoStates(788, 790); }
                   break;
-               case 764:
+               case 791:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1769, 1771); }
+                     { jjCheckNAddStates(1808, 1810); }
                   break;
-               case 766:
+               case 793:
                   if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(767); }
+                     { jjCheckNAdd(794); }
                   break;
-               case 767:
+               case 794:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(767, 769); }
+                     { jjCheckNAddTwoStates(794, 796); }
                   break;
-               case 770:
+               case 797:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1772, 1774); }
+                     { jjCheckNAddStates(1811, 1813); }
                   break;
-               case 772:
+               case 799:
                   if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(773); }
+                     { jjCheckNAdd(800); }
                   break;
-               case 773:
+               case 800:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(773, 775); }
+                     { jjCheckNAddTwoStates(800, 802); }
                   break;
-               case 776:
+               case 803:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1775, 1780); }
+                     { jjCheckNAddStates(1814, 1819); }
                   break;
-               case 778:
+               case 805:
                   if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(779); }
+                     { jjCheckNAdd(806); }
                   break;
-               case 779:
+               case 806:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1781, 1785); }
+                     { jjCheckNAddStates(1820, 1824); }
                   break;
-               case 793:
+               case 820:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1786, 1788); }
+                     { jjCheckNAddStates(1825, 1827); }
                   break;
-               case 795:
+               case 822:
                   if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(796); }
+                     { jjCheckNAdd(823); }
                   break;
-               case 796:
+               case 823:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(796, 798); }
+                     { jjCheckNAddTwoStates(823, 825); }
                   break;
-               case 799:
+               case 826:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1789, 1791); }
+                     { jjCheckNAddStates(1828, 1830); }
                   break;
-               case 801:
+               case 828:
                   if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(802); }
+                     { jjCheckNAdd(829); }
                   break;
-               case 802:
+               case 829:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(802, 804); }
+                     { jjCheckNAddTwoStates(829, 831); }
                   break;
-               case 805:
+               case 832:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1792, 1795); }
+                     { jjCheckNAddStates(1831, 1834); }
                   break;
-               case 807:
+               case 834:
                   if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(808); }
+                     { jjCheckNAdd(835); }
                   break;
-               case 808:
+               case 835:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1796, 1798); }
+                     { jjCheckNAddStates(1835, 1837); }
                   break;
-               case 812:
+               case 839:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1799, 1802); }
+                     { jjCheckNAddStates(1838, 1841); }
                   break;
-               case 814:
+               case 841:
                   if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(815); }
+                     { jjCheckNAdd(842); }
                   break;
-               case 815:
+               case 842:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1803, 1805); }
+                     { jjCheckNAddStates(1842, 1844); }
                   break;
-               case 820:
+               case 847:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1806, 1809); }
+                     { jjCheckNAddStates(1845, 1848); }
                   break;
-               case 822:
+               case 849:
                   if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(823); }
+                     { jjCheckNAdd(850); }
                   break;
-               case 823:
+               case 850:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1810, 1812); }
+                     { jjCheckNAddStates(1849, 1851); }
                   break;
-               case 834:
+               case 861:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1813, 1815); }
+                     { jjCheckNAddStates(1852, 1854); }
                   break;
-               case 836:
+               case 863:
                   if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(837); }
+                     { jjCheckNAdd(864); }
                   break;
-               case 837:
+               case 864:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(837, 838); }
+                     { jjCheckNAddTwoStates(864, 865); }
                   break;
-               case 839:
+               case 866:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1816, 1819); }
+                     { jjCheckNAddStates(1855, 1858); }
                   break;
-               case 841:
+               case 868:
                   if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(842); }
+                     { jjCheckNAdd(869); }
                   break;
-               case 842:
+               case 869:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1820, 1822); }
+                     { jjCheckNAddStates(1859, 1861); }
                   break;
-               case 844:
+               case 871:
                   if ((0x3ff200000000000L & l) != 0L)
-                     { jjCheckNAddStates(1823, 1825); }
+                     { jjCheckNAddStates(1862, 1864); }
                   break;
-               case 845:
+               case 872:
                   if (curChar == 57 && kind > 72)
                      kind = 72;
                   break;
-               case 848:
+               case 875:
                   if ((0xfc00ffffffffcbffL & l) != 0L)
-                     { jjCheckNAddStates(1823, 1825); }
+                     { jjCheckNAddStates(1862, 1864); }
                   break;
-               case 849:
+               case 876:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1826, 1831); }
+                     { jjCheckNAddStates(1865, 1870); }
                   break;
-               case 850:
+               case 877:
                   if (curChar == 10)
-                     { jjCheckNAddStates(1823, 1825); }
+                     { jjCheckNAddStates(1862, 1864); }
                   break;
-               case 851:
-               case 860:
+               case 878:
+               case 887:
                   if (curChar == 13)
-                     { jjCheckNAdd(850); }
+                     { jjCheckNAdd(877); }
                   break;
-               case 852:
+               case 879:
                   if ((0x100003600L & l) != 0L)
-                     { jjCheckNAddStates(1823, 1825); }
+                     { jjCheckNAddStates(1862, 1864); }
                   break;
-               case 853:
+               case 880:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1832, 1840); }
+                     { jjCheckNAddStates(1871, 1879); }
                   break;
-               case 854:
+               case 881:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1841, 1845); }
+                     { jjCheckNAddStates(1880, 1884); }
                   break;
-               case 855:
+               case 882:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1846, 1851); }
+                     { jjCheckNAddStates(1885, 1890); }
                   break;
-               case 856:
+               case 883:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1852, 1858); }
+                     { jjCheckNAddStates(1891, 1897); }
                   break;
-               case 857:
+               case 884:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1859, 1866); }
+                     { jjCheckNAddStates(1898, 1905); }
                   break;
-               case 859:
+               case 886:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1867, 1872); }
+                     { jjCheckNAddStates(1906, 1911); }
                   break;
-               case 861:
+               case 888:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1873, 1881); }
+                     { jjCheckNAddStates(1912, 1920); }
                   break;
-               case 862:
+               case 889:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1882, 1886); }
+                     { jjCheckNAddStates(1921, 1925); }
                   break;
-               case 863:
+               case 890:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1887, 1892); }
+                     { jjCheckNAddStates(1926, 1931); }
                   break;
-               case 864:
+               case 891:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1893, 1899); }
+                     { jjCheckNAddStates(1932, 1938); }
                   break;
-               case 865:
+               case 892:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1900, 1907); }
+                     { jjCheckNAddStates(1939, 1946); }
                   break;
-               case 866:
+               case 893:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1908, 1911); }
+                     { jjCheckNAddStates(1947, 1950); }
                   break;
-               case 868:
+               case 895:
                   if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(869); }
+                     { jjCheckNAdd(896); }
                   break;
-               case 869:
+               case 896:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1912, 1914); }
+                     { jjCheckNAddStates(1951, 1953); }
                   break;
-               case 871:
+               case 898:
                   if ((0x3ff200000000000L & l) == 0L)
                      break;
                   if (kind > 73)
                      kind = 73;
-                  { jjCheckNAddTwoStates(871, 872); }
+                  { jjCheckNAddTwoStates(898, 899); }
                   break;
-               case 873:
+               case 900:
                   if ((0xfc00ffffffffcbffL & l) == 0L)
                      break;
                   if (kind > 73)
                      kind = 73;
-                  { jjCheckNAddTwoStates(871, 872); }
+                  { jjCheckNAddTwoStates(898, 899); }
                   break;
-               case 874:
+               case 901:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 73)
                      kind = 73;
-                  { jjCheckNAddStates(1915, 1919); }
+                  { jjCheckNAddStates(1954, 1958); }
                   break;
-               case 875:
+               case 902:
                   if (curChar != 10)
                      break;
                   if (kind > 73)
                      kind = 73;
-                  { jjCheckNAddTwoStates(871, 872); }
+                  { jjCheckNAddTwoStates(898, 899); }
                   break;
-               case 876:
-               case 885:
+               case 903:
+               case 912:
                   if (curChar == 13)
-                     { jjCheckNAdd(875); }
+                     { jjCheckNAdd(902); }
                   break;
-               case 877:
+               case 904:
                   if ((0x100003600L & l) == 0L)
                      break;
                   if (kind > 73)
                      kind = 73;
-                  { jjCheckNAddTwoStates(871, 872); }
+                  { jjCheckNAddTwoStates(898, 899); }
                   break;
-               case 878:
+               case 905:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 73)
                      kind = 73;
-                  { jjCheckNAddStates(1920, 1927); }
+                  { jjCheckNAddStates(1959, 1966); }
                   break;
-               case 879:
+               case 906:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 73)
                      kind = 73;
-                  { jjCheckNAddStates(1928, 1931); }
+                  { jjCheckNAddStates(1967, 1970); }
                   break;
-               case 880:
+               case 907:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 73)
                      kind = 73;
-                  { jjCheckNAddStates(1932, 1936); }
+                  { jjCheckNAddStates(1971, 1975); }
                   break;
-               case 881:
+               case 908:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 73)
                      kind = 73;
-                  { jjCheckNAddStates(1937, 1942); }
+                  { jjCheckNAddStates(1976, 1981); }
                   break;
-               case 882:
+               case 909:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 73)
                      kind = 73;
-                  { jjCheckNAddStates(1943, 1949); }
+                  { jjCheckNAddStates(1982, 1988); }
                   break;
-               case 884:
+               case 911:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 73)
                      kind = 73;
-                  { jjCheckNAddStates(1950, 1954); }
+                  { jjCheckNAddStates(1989, 1993); }
                   break;
-               case 886:
+               case 913:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 73)
                      kind = 73;
-                  { jjCheckNAddStates(1955, 1962); }
+                  { jjCheckNAddStates(1994, 2001); }
                   break;
-               case 887:
+               case 914:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 73)
                      kind = 73;
-                  { jjCheckNAddStates(1963, 1966); }
+                  { jjCheckNAddStates(2002, 2005); }
                   break;
-               case 888:
+               case 915:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 73)
                      kind = 73;
-                  { jjCheckNAddStates(1967, 1971); }
+                  { jjCheckNAddStates(2006, 2010); }
                   break;
-               case 889:
+               case 916:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 73)
                      kind = 73;
-                  { jjCheckNAddStates(1972, 1977); }
+                  { jjCheckNAddStates(2011, 2016); }
                   break;
-               case 890:
+               case 917:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 73)
                      kind = 73;
-                  { jjCheckNAddStates(1978, 1984); }
+                  { jjCheckNAddStates(2017, 2023); }
                   break;
-               case 891:
+               case 918:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(1985, 1987); }
+                     { jjCheckNAddStates(2024, 2026); }
                   break;
-               case 893:
+               case 920:
                   if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(894); }
+                     { jjCheckNAdd(921); }
                   break;
-               case 894:
+               case 921:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(894, 895); }
+                     { jjCheckNAddTwoStates(921, 922); }
                   break;
-               case 895:
+               case 922:
                   if (curChar == 37 && kind > 74)
                      kind = 74;
                   break;
-               case 896:
+               case 923:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 75)
                      kind = 75;
-                  { jjCheckNAddTwoStates(896, 897); }
+                  { jjCheckNAddTwoStates(923, 924); }
                   break;
-               case 898:
+               case 925:
                   if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(899); }
+                     { jjCheckNAdd(926); }
                   break;
-               case 899:
+               case 926:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 75)
                      kind = 75;
-                  { jjCheckNAdd(899); }
+                  { jjCheckNAdd(926); }
                   break;
-               case 900:
-                  if (curChar == 45)
-                     { jjCheckNAddTwoStates(901, 914); }
+               case 927:
+                  if (curChar == 33)
+                     { jjCheckNAddStates(200, 203); }
                   break;
-               case 902:
-                  if ((0x3ff200000000000L & l) == 0L)
-                     break;
-                  if (kind > 120)
-                     kind = 120;
-                  { jjCheckNAddTwoStates(902, 903); }
+               case 928:
+                  if ((0x100003600L & l) != 0L)
+                     { jjCheckNAddStates(2027, 2029); }
                   break;
-               case 904:
-                  if ((0xfc00ffffffffcbffL & l) == 0L)
-                     break;
-                  if (kind > 120)
-                     kind = 120;
-                  { jjCheckNAddTwoStates(902, 903); }
-                  break;
-               case 905:
-                  if ((0x3ff000000000000L & l) == 0L)
-                     break;
-                  if (kind > 120)
-                     kind = 120;
-                  { jjCheckNAddStates(1988, 1992); }
-                  break;
-               case 906:
-                  if (curChar != 10)
-                     break;
-                  if (kind > 120)
-                     kind = 120;
-                  { jjCheckNAddTwoStates(902, 903); }
-                  break;
-               case 907:
-               case 916:
-                  if (curChar == 13)
-                     { jjCheckNAdd(906); }
-                  break;
-               case 908:
-                  if ((0x100003600L & l) == 0L)
-                     break;
-                  if (kind > 120)
-                     kind = 120;
-                  { jjCheckNAddTwoStates(902, 903); }
-                  break;
-               case 909:
-                  if ((0x3ff000000000000L & l) == 0L)
-                     break;
-                  if (kind > 120)
-                     kind = 120;
-                  { jjCheckNAddStates(1993, 2000); }
-                  break;
-               case 910:
-                  if ((0x3ff000000000000L & l) == 0L)
-                     break;
-                  if (kind > 120)
-                     kind = 120;
-                  { jjCheckNAddStates(2001, 2004); }
-                  break;
-               case 911:
-                  if ((0x3ff000000000000L & l) == 0L)
-                     break;
-                  if (kind > 120)
-                     kind = 120;
-                  { jjCheckNAddStates(2005, 2009); }
-                  break;
-               case 912:
-                  if ((0x3ff000000000000L & l) == 0L)
-                     break;
-                  if (kind > 120)
-                     kind = 120;
-                  { jjCheckNAddStates(2010, 2015); }
-                  break;
-               case 913:
-                  if ((0x3ff000000000000L & l) == 0L)
-                     break;
-                  if (kind > 120)
-                     kind = 120;
-                  { jjCheckNAddStates(2016, 2022); }
-                  break;
-               case 915:
-                  if ((0x3ff000000000000L & l) == 0L)
-                     break;
-                  if (kind > 120)
-                     kind = 120;
-                  { jjCheckNAddStates(2023, 2027); }
-                  break;
-               case 917:
-                  if ((0x3ff000000000000L & l) == 0L)
-                     break;
-                  if (kind > 120)
-                     kind = 120;
-                  { jjCheckNAddStates(2028, 2035); }
-                  break;
-               case 918:
-                  if ((0x3ff000000000000L & l) == 0L)
-                     break;
-                  if (kind > 120)
-                     kind = 120;
-                  { jjCheckNAddStates(2036, 2039); }
-                  break;
-               case 919:
-                  if ((0x3ff000000000000L & l) == 0L)
-                     break;
-                  if (kind > 120)
-                     kind = 120;
-                  { jjCheckNAddStates(2040, 2044); }
-                  break;
-               case 920:
-                  if ((0x3ff000000000000L & l) == 0L)
-                     break;
-                  if (kind > 120)
-                     kind = 120;
-                  { jjCheckNAddStates(2045, 2050); }
-                  break;
-               case 921:
-                  if ((0x3ff000000000000L & l) == 0L)
-                     break;
-                  if (kind > 120)
-                     kind = 120;
-                  { jjCheckNAddStates(2051, 2057); }
-                  break;
-               case 922:
-                  if (curChar == 33)
-                     { jjCheckNAddStates(198, 201); }
-                  break;
-               case 923:
-                  if ((0x100003600L & l) != 0L)
-                     { jjCheckNAddStates(2058, 2060); }
-                  break;
-               case 924:
+               case 929:
                   if (curChar == 42)
-                     { jjCheckNAddTwoStates(925, 926); }
+                     { jjCheckNAddTwoStates(930, 931); }
                   break;
-               case 925:
+               case 930:
                   if ((0xfffffbffffffffffL & l) != 0L)
-                     { jjCheckNAddTwoStates(925, 926); }
+                     { jjCheckNAddTwoStates(930, 931); }
                   break;
-               case 926:
+               case 931:
                   if (curChar == 42)
-                     { jjCheckNAddStates(2061, 2063); }
+                     { jjCheckNAddStates(2030, 2032); }
                   break;
-               case 927:
+               case 932:
                   if ((0xffff7bffffffffffL & l) != 0L)
-                     { jjCheckNAddTwoStates(928, 929); }
+                     { jjCheckNAddTwoStates(933, 934); }
                   break;
-               case 928:
+               case 933:
                   if ((0xfffffbffffffffffL & l) != 0L)
-                     { jjCheckNAddTwoStates(928, 929); }
+                     { jjCheckNAddTwoStates(933, 934); }
                   break;
-               case 929:
+               case 934:
                   if (curChar == 42)
-                     { jjCheckNAddStates(2064, 2066); }
+                     { jjCheckNAddStates(2033, 2035); }
                   break;
-               case 930:
+               case 935:
                   if (curChar == 47)
-                     { jjCheckNAddStates(2058, 2060); }
+                     { jjCheckNAddStates(2027, 2029); }
                   break;
-               case 931:
+               case 936:
                   if (curChar == 47)
-                     jjstateSet[jjnewStateCnt++] = 924;
+                     jjstateSet[jjnewStateCnt++] = 929;
                   break;
-               case 941:
+               case 946:
                   if ((0x100003600L & l) != 0L)
-                     { jjCheckNAddStates(2067, 2069); }
+                     { jjCheckNAddStates(2036, 2038); }
                   break;
-               case 942:
+               case 947:
                   if (curChar == 42)
-                     { jjCheckNAddTwoStates(943, 944); }
+                     { jjCheckNAddTwoStates(948, 949); }
                   break;
-               case 943:
+               case 948:
                   if ((0xfffffbffffffffffL & l) != 0L)
-                     { jjCheckNAddTwoStates(943, 944); }
+                     { jjCheckNAddTwoStates(948, 949); }
                   break;
-               case 944:
+               case 949:
                   if (curChar == 42)
-                     { jjCheckNAddStates(2070, 2072); }
+                     { jjCheckNAddStates(2039, 2041); }
                   break;
-               case 945:
+               case 950:
                   if ((0xffff7bffffffffffL & l) != 0L)
-                     { jjCheckNAddTwoStates(946, 947); }
+                     { jjCheckNAddTwoStates(951, 952); }
                   break;
-               case 946:
+               case 951:
                   if ((0xfffffbffffffffffL & l) != 0L)
-                     { jjCheckNAddTwoStates(946, 947); }
+                     { jjCheckNAddTwoStates(951, 952); }
                   break;
-               case 947:
+               case 952:
                   if (curChar == 42)
-                     { jjCheckNAddStates(2073, 2075); }
+                     { jjCheckNAddStates(2042, 2044); }
                   break;
-               case 948:
+               case 953:
                   if (curChar == 47)
-                     { jjCheckNAddStates(2067, 2069); }
+                     { jjCheckNAddStates(2036, 2038); }
                   break;
-               case 949:
+               case 954:
                   if (curChar == 47)
-                     jjstateSet[jjnewStateCnt++] = 942;
+                     jjstateSet[jjnewStateCnt++] = 947;
                   break;
-               case 951:
+               case 956:
                   if ((0x280000000000000L & l) != 0L && kind > 77)
                      kind = 77;
                   break;
-               case 954:
+               case 983:
+                  if (curChar == 50)
+                     jjstateSet[jjnewStateCnt++] = 52;
+                  break;
+               case 988:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 75)
                      kind = 75;
-                  { jjCheckNAddStates(0, 171); }
+                  { jjCheckNAddStates(0, 173); }
                   break;
-               case 955:
+               case 989:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(2076, 2078); }
+                     { jjCheckNAddStates(2045, 2048); }
                   break;
-               case 956:
+               case 990:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(956, 957); }
+                     { jjCheckNAddTwoStates(990, 991); }
                   break;
-               case 957:
+               case 991:
                   if (curChar == 46)
-                     { jjCheckNAdd(642); }
+                     { jjCheckNAdd(669); }
                   break;
-               case 958:
+               case 992:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(2079, 2081); }
+                     { jjCheckNAddStates(2049, 2052); }
                   break;
-               case 959:
+               case 993:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(959, 960); }
+                     { jjCheckNAddTwoStates(993, 994); }
                   break;
-               case 960:
+               case 994:
                   if (curChar == 46)
-                     { jjCheckNAdd(648); }
+                     { jjCheckNAdd(676); }
                   break;
-               case 961:
+               case 995:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(2082, 2084); }
+                     { jjCheckNAddStates(2053, 2056); }
                   break;
-               case 962:
+               case 996:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(962, 963); }
+                     { jjCheckNAddTwoStates(996, 997); }
                   break;
-               case 963:
+               case 997:
                   if (curChar == 46)
-                     { jjCheckNAdd(654); }
+                     { jjCheckNAdd(683); }
                   break;
-               case 964:
+               case 998:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(2085, 2087); }
+                     { jjCheckNAddStates(2057, 2060); }
                   break;
-               case 965:
+               case 999:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(965, 966); }
+                     { jjCheckNAddTwoStates(999, 1000); }
                   break;
-               case 966:
+               case 1000:
                   if (curChar == 46)
-                     { jjCheckNAdd(661); }
+                     { jjCheckNAdd(691); }
                   break;
-               case 967:
+               case 1001:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(2088, 2090); }
+                     { jjCheckNAddStates(2061, 2064); }
                   break;
-               case 968:
+               case 1002:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(968, 969); }
+                     { jjCheckNAddTwoStates(1002, 1003); }
                   break;
-               case 969:
+               case 1003:
                   if (curChar == 46)
-                     { jjCheckNAdd(667); }
+                     { jjCheckNAdd(698); }
                   break;
-               case 970:
+               case 1004:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(2091, 2093); }
+                     { jjCheckNAddStates(2065, 2068); }
                   break;
-               case 971:
+               case 1005:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(971, 972); }
+                     { jjCheckNAddTwoStates(1005, 1006); }
                   break;
-               case 972:
+               case 1006:
                   if (curChar == 46)
-                     { jjCheckNAdd(673); }
+                     { jjCheckNAdd(705); }
                   break;
-               case 973:
+               case 1007:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(2094, 2096); }
+                     { jjCheckNAddStates(2069, 2072); }
                   break;
-               case 974:
+               case 1008:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(974, 975); }
+                     { jjCheckNAddTwoStates(1008, 1009); }
                   break;
-               case 975:
+               case 1009:
                   if (curChar == 46)
-                     { jjCheckNAdd(678); }
+                     { jjCheckNAdd(711); }
                   break;
-               case 976:
+               case 1010:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(2097, 2099); }
+                     { jjCheckNAddStates(2073, 2076); }
                   break;
-               case 977:
+               case 1011:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(977, 978); }
+                     { jjCheckNAddTwoStates(1011, 1012); }
                   break;
-               case 978:
+               case 1012:
                   if (curChar == 46)
-                     { jjCheckNAdd(684); }
+                     { jjCheckNAdd(718); }
                   break;
-               case 979:
+               case 1013:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(2100, 2102); }
+                     { jjCheckNAddStates(2077, 2080); }
                   break;
-               case 980:
+               case 1014:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(980, 981); }
+                     { jjCheckNAddTwoStates(1014, 1015); }
                   break;
-               case 981:
+               case 1015:
                   if (curChar == 46)
-                     { jjCheckNAdd(690); }
+                     { jjCheckNAdd(725); }
                   break;
-               case 982:
+               case 1016:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(2103, 2105); }
+                     { jjCheckNAddStates(2081, 2084); }
                   break;
-               case 983:
+               case 1017:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(983, 984); }
+                     { jjCheckNAddTwoStates(1017, 1018); }
                   break;
-               case 984:
+               case 1018:
                   if (curChar == 46)
-                     { jjCheckNAdd(696); }
+                     { jjCheckNAdd(732); }
                   break;
-               case 985:
+               case 1019:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(2106, 2108); }
+                     { jjCheckNAddStates(2085, 2088); }
                   break;
-               case 986:
+               case 1020:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(986, 987); }
+                     { jjCheckNAddTwoStates(1020, 1021); }
                   break;
-               case 987:
+               case 1021:
                   if (curChar == 46)
-                     { jjCheckNAdd(702); }
+                     { jjCheckNAdd(739); }
                   break;
-               case 988:
+               case 1022:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(2109, 2111); }
+                     { jjCheckNAddStates(2089, 2092); }
                   break;
-               case 989:
+               case 1023:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(989, 990); }
+                     { jjCheckNAddTwoStates(1023, 1024); }
                   break;
-               case 990:
+               case 1024:
                   if (curChar == 46)
-                     { jjCheckNAdd(708); }
+                     { jjCheckNAdd(748); }
                   break;
-               case 991:
+               case 1025:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(2112, 2114); }
+                     { jjCheckNAddStates(2093, 2095); }
                   break;
-               case 992:
+               case 1026:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(992, 993); }
+                     { jjCheckNAddTwoStates(1026, 1027); }
                   break;
-               case 993:
+               case 1027:
                   if (curChar == 46)
-                     { jjCheckNAdd(714); }
+                     { jjCheckNAdd(757); }
                   break;
-               case 994:
+               case 1028:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(2115, 2117); }
+                     { jjCheckNAddStates(2096, 2098); }
                   break;
-               case 995:
+               case 1029:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(995, 996); }
+                     { jjCheckNAddTwoStates(1029, 1030); }
                   break;
-               case 996:
+               case 1030:
                   if (curChar == 46)
-                     { jjCheckNAdd(722); }
+                     { jjCheckNAdd(763); }
                   break;
-               case 997:
+               case 1031:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(2118, 2120); }
+                     { jjCheckNAddStates(2099, 2101); }
                   break;
-               case 998:
+               case 1032:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(998, 999); }
+                     { jjCheckNAddTwoStates(1032, 1033); }
                   break;
-               case 999:
+               case 1033:
                   if (curChar == 46)
-                     { jjCheckNAdd(730); }
+                     { jjCheckNAdd(768); }
                   break;
-               case 1000:
+               case 1034:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(2121, 2123); }
+                     { jjCheckNAddStates(2102, 2104); }
                   break;
-               case 1001:
+               case 1035:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(1001, 1002); }
+                     { jjCheckNAddTwoStates(1035, 1036); }
                   break;
-               case 1002:
+               case 1036:
                   if (curChar == 46)
-                     { jjCheckNAdd(736); }
+                     { jjCheckNAdd(773); }
                   break;
-               case 1003:
+               case 1037:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(2124, 2126); }
+                     { jjCheckNAddStates(2105, 2107); }
                   break;
-               case 1004:
+               case 1038:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(1004, 1005); }
+                     { jjCheckNAddTwoStates(1038, 1039); }
                   break;
-               case 1005:
+               case 1039:
                   if (curChar == 46)
-                     { jjCheckNAdd(741); }
+                     { jjCheckNAdd(779); }
                   break;
-               case 1006:
+               case 1040:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(2127, 2129); }
+                     { jjCheckNAddStates(2108, 2110); }
                   break;
-               case 1007:
+               case 1041:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(1007, 1008); }
+                     { jjCheckNAddTwoStates(1041, 1042); }
                   break;
-               case 1008:
+               case 1042:
                   if (curChar == 46)
-                     { jjCheckNAdd(746); }
+                     { jjCheckNAdd(785); }
                   break;
-               case 1009:
+               case 1043:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(2130, 2132); }
+                     { jjCheckNAddStates(2111, 2113); }
                   break;
-               case 1010:
+               case 1044:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(1010, 1011); }
+                     { jjCheckNAddTwoStates(1044, 1045); }
                   break;
-               case 1011:
+               case 1045:
                   if (curChar == 46)
-                     { jjCheckNAdd(752); }
+                     { jjCheckNAdd(791); }
                   break;
-               case 1012:
+               case 1046:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(2133, 2135); }
+                     { jjCheckNAddStates(2114, 2116); }
                   break;
-               case 1013:
+               case 1047:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(1013, 1014); }
+                     { jjCheckNAddTwoStates(1047, 1048); }
                   break;
-               case 1014:
+               case 1048:
                   if (curChar == 46)
-                     { jjCheckNAdd(758); }
+                     { jjCheckNAdd(797); }
                   break;
-               case 1015:
+               case 1049:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(2136, 2138); }
+                     { jjCheckNAddStates(2117, 2122); }
                   break;
-               case 1016:
+               case 1050:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(1016, 1017); }
+                     { jjCheckNAddTwoStates(1050, 1051); }
                   break;
-               case 1017:
+               case 1051:
                   if (curChar == 46)
-                     { jjCheckNAdd(764); }
+                     { jjCheckNAdd(803); }
                   break;
-               case 1018:
+               case 1052:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(2139, 2141); }
+                     { jjCheckNAddStates(2123, 2125); }
                   break;
-               case 1019:
+               case 1053:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(1019, 1020); }
+                     { jjCheckNAddTwoStates(1053, 1054); }
                   break;
-               case 1020:
+               case 1054:
                   if (curChar == 46)
-                     { jjCheckNAdd(770); }
+                     { jjCheckNAdd(820); }
                   break;
-               case 1021:
+               case 1055:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(2142, 2147); }
+                     { jjCheckNAddStates(2126, 2128); }
                   break;
-               case 1022:
+               case 1056:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(1022, 1023); }
+                     { jjCheckNAddTwoStates(1056, 1057); }
                   break;
-               case 1023:
+               case 1057:
                   if (curChar == 46)
-                     { jjCheckNAdd(776); }
+                     { jjCheckNAdd(826); }
                   break;
-               case 1024:
-                  if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(2148, 2150); }
-                  break;
-               case 1025:
-                  if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(1025, 1026); }
-                  break;
-               case 1026:
-                  if (curChar == 46)
-                     { jjCheckNAdd(793); }
-                  break;
-               case 1027:
-                  if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(2151, 2153); }
-                  break;
-               case 1028:
-                  if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(1028, 1029); }
-                  break;
-               case 1029:
-                  if (curChar == 46)
-                     { jjCheckNAdd(799); }
-                  break;
-               case 1030:
+               case 1058:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(2154, 2157); }
+                     { jjCheckNAddStates(2129, 2132); }
                   break;
-               case 1031:
+               case 1059:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(1031, 1032); }
+                     { jjCheckNAddTwoStates(1059, 1060); }
                   break;
-               case 1032:
+               case 1060:
                   if (curChar == 46)
-                     { jjCheckNAdd(805); }
+                     { jjCheckNAdd(832); }
                   break;
-               case 1033:
+               case 1061:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(2158, 2161); }
+                     { jjCheckNAddStates(2133, 2136); }
                   break;
-               case 1034:
+               case 1062:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(1034, 1035); }
+                     { jjCheckNAddTwoStates(1062, 1063); }
                   break;
-               case 1035:
+               case 1063:
                   if (curChar == 46)
-                     { jjCheckNAdd(812); }
+                     { jjCheckNAdd(839); }
                   break;
-               case 1036:
+               case 1064:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(2162, 2165); }
+                     { jjCheckNAddStates(2137, 2140); }
                   break;
-               case 1037:
+               case 1065:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(1037, 1038); }
+                     { jjCheckNAddTwoStates(1065, 1066); }
                   break;
-               case 1038:
+               case 1066:
                   if (curChar == 46)
-                     { jjCheckNAdd(820); }
+                     { jjCheckNAdd(847); }
                   break;
-               case 1039:
+               case 1067:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(2166, 2168); }
+                     { jjCheckNAddStates(2141, 2143); }
                   break;
-               case 1040:
+               case 1068:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(1040, 1041); }
+                     { jjCheckNAddTwoStates(1068, 1069); }
                   break;
-               case 1041:
+               case 1069:
                   if (curChar == 46)
-                     { jjCheckNAdd(834); }
+                     { jjCheckNAdd(861); }
                   break;
-               case 1042:
+               case 1070:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(2169, 2172); }
+                     { jjCheckNAddStates(2144, 2147); }
                   break;
-               case 1043:
+               case 1071:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(1043, 1044); }
+                     { jjCheckNAddTwoStates(1071, 1072); }
                   break;
-               case 1044:
+               case 1072:
                   if (curChar == 46)
-                     { jjCheckNAdd(839); }
+                     { jjCheckNAdd(866); }
                   break;
-               case 1045:
+               case 1073:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(2173, 2176); }
+                     { jjCheckNAddStates(2148, 2151); }
                   break;
-               case 1046:
+               case 1074:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(1046, 1047); }
+                     { jjCheckNAddTwoStates(1074, 1075); }
                   break;
-               case 1047:
+               case 1075:
                   if (curChar == 46)
-                     { jjCheckNAdd(866); }
+                     { jjCheckNAdd(893); }
                   break;
-               case 1048:
+               case 1076:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(2177, 2179); }
+                     { jjCheckNAddStates(2152, 2154); }
                   break;
-               case 1049:
+               case 1077:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(1049, 1050); }
+                     { jjCheckNAddTwoStates(1077, 1078); }
                   break;
-               case 1050:
+               case 1078:
                   if (curChar == 46)
-                     { jjCheckNAdd(891); }
+                     { jjCheckNAdd(918); }
                   break;
-               case 1051:
+               case 1079:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 75)
                      kind = 75;
-                  { jjCheckNAddTwoStates(1051, 897); }
+                  { jjCheckNAddTwoStates(1079, 924); }
                   break;
-               case 1052:
+               case 1080:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(1052, 1053); }
+                     { jjCheckNAddTwoStates(1080, 1081); }
                   break;
-               case 1053:
+               case 1081:
                   if (curChar == 46)
-                     { jjCheckNAdd(896); }
+                     { jjCheckNAdd(923); }
                   break;
                default : break;
             }
@@ -5089,18 +4929,18 @@ else if (curChar < 128)
                   {
                      if (kind > 41)
                         kind = 41;
-                     { jjCheckNAddStates(2180, 2184); }
+                     { jjCheckNAddStates(2155, 2159); }
                   }
                   else if (curChar == 92)
-                     { jjCheckNAddStates(2185, 2188); }
+                     { jjCheckNAddStates(2160, 2163); }
                   else if (curChar == 126)
                   {
                      if (kind > 33)
                         kind = 33;
-                     { jjCheckNAdd(300); }
+                     { jjCheckNAdd(288); }
                   }
                   else if (curChar == 64)
-                     { jjAddStates(2189, 2191); }
+                     { jjAddStates(2164, 2166); }
                   else if (curChar == 124)
                      jjstateSet[jjnewStateCnt++] = 14;
                   else if (curChar == 123)
@@ -5108,15 +4948,31 @@ else if (curChar == 123)
                      if (kind > 27)
                         kind = 27;
                   }
-                  if ((0x20000000200000L & l) != 0L)
-                     { jjAddStates(2192, 2194); }
+                  if ((0x200000002L & l) != 0L)
+                     { jjAddStates(2167, 2171); }
+                  else if ((0x200000002000L & l) != 0L)
+                     { jjAddStates(2172, 2174); }
                   else if ((0x800000008L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 79;
+                     { jjAddStates(2175, 2176); }
+                  else if ((0x20000000200000L & l) != 0L)
+                     { jjAddStates(2177, 2179); }
                   else if ((0x1000000010000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 51;
+                     { jjAddStates(2180, 2181); }
+                  else if ((0x8000000080000L & l) != 0L)
+                     { jjAddStates(2182, 2184); }
+                  else if ((0x100000001000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 57;
+                  else if ((0x4000000040000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 54;
+                  else if ((0x2000000020L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 50;
+                  else if ((0x10000000100000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 47;
+                  else if ((0x10000000100L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 43;
                   break;
                case 1:
-                  { jjAddStates(2195, 2196); }
+                  { jjAddStates(2185, 2186); }
                   break;
                case 3:
                case 4:
@@ -5134,2501 +4990,2614 @@ else if ((0x1000000010000L & l) != 0L)
                   if (curChar == 124)
                      jjstateSet[jjnewStateCnt++] = 14;
                   break;
-               case 17:
-                  if ((0x7fffffe07fffffeL & l) != 0L)
-                     { jjCheckNAddTwoStates(17, 18); }
-                  break;
-               case 18:
-                  { jjCheckNAddTwoStates(18, 19); }
-                  break;
-               case 20:
-                  if ((0x10000000100000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 16;
-                  break;
-               case 21:
-                  if ((0x4000000040L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 20;
-                  break;
-               case 22:
-                  if ((0x800000008000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 21;
-                  break;
-               case 23:
-                  if ((0x8000000080000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 22;
-                  break;
-               case 24:
-                  if ((0x800000008000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 23;
-                  break;
-               case 25:
-                  if ((0x4000000040000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 24;
-                  break;
-               case 26:
-                  if ((0x800000008L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 25;
-                  break;
-               case 27:
-                  if ((0x20000000200L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 26;
-                  break;
-               case 28:
-                  if ((0x200000002000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 27;
-                  break;
-               case 30:
-                  if ((0x200000002000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 29;
-                  break;
-               case 31:
-                  if ((0x4000000040000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 30;
-                  break;
-               case 32:
-                  if ((0x800000008000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 31;
-                  break;
-               case 33:
-                  if ((0x4000000040L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 32;
-                  break;
-               case 34:
-                  if ((0x8000000080000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 33;
-                  break;
-               case 35:
-                  if ((0x400000004000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 34;
-                  break;
-               case 36:
-                  if ((0x200000002L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 35;
-                  break;
-               case 37:
-                  if ((0x4000000040000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 36;
-                  break;
-               case 38:
-                  if ((0x10000000100000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 37;
-                  break;
-               case 39:
-                  if ((0x2000000020L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 38;
-                  break;
-               case 40:
-                  if ((0x8000000080L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 39;
-                  break;
-               case 41:
-                  if ((0x200000002L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 40;
-                  break;
-               case 42:
-                  if ((0x200000002000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 41;
-                  break;
-               case 43:
-                  if ((0x20000000200L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 42;
-                  break;
-               case 44:
-                  if ((0x100000001000000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 43;
-                  break;
-               case 45:
-                  if ((0x1000000010L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 44;
-                  break;
-               case 47:
-                  if ((0x1000000010L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 46;
-                  break;
-               case 48:
-                  if ((0x20000000200L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 47;
-                  break;
-               case 49:
-                  if ((0x8000000080L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 48;
-                  break;
-               case 50:
-                  if ((0x800000008000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 49;
-                  break;
-               case 51:
-                  if ((0x4000000040000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 50;
-                  break;
-               case 52:
-                  if ((0x1000000010000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 51;
-                  break;
-               case 53:
+               case 16:
                   if (curChar == 64)
-                     { jjAddStates(2189, 2191); }
+                     { jjAddStates(2164, 2166); }
                   break;
-               case 55:
-               case 56:
+               case 18:
+               case 19:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
                   if (kind > 109)
                      kind = 109;
-                  { jjCheckNAddTwoStates(56, 57); }
+                  { jjCheckNAddTwoStates(19, 20); }
                   break;
-               case 57:
+               case 20:
                   if (curChar == 92)
-                     { jjCheckNAddTwoStates(58, 59); }
+                     { jjCheckNAddTwoStates(21, 22); }
                   break;
-               case 58:
+               case 21:
                   if ((0xffffff81ffffff81L & l) == 0L)
                      break;
                   if (kind > 109)
                      kind = 109;
-                  { jjCheckNAddTwoStates(56, 57); }
+                  { jjCheckNAddTwoStates(19, 20); }
                   break;
-               case 59:
+               case 22:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 109)
                      kind = 109;
-                  { jjCheckNAddStates(275, 279); }
+                  { jjCheckNAddStates(270, 274); }
                   break;
-               case 63:
+               case 26:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 109)
                      kind = 109;
-                  { jjCheckNAddStates(280, 287); }
+                  { jjCheckNAddStates(275, 282); }
                   break;
-               case 64:
+               case 27:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 109)
                      kind = 109;
-                  { jjCheckNAddStates(288, 291); }
+                  { jjCheckNAddStates(283, 286); }
                   break;
-               case 65:
+               case 28:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 109)
                      kind = 109;
-                  { jjCheckNAddStates(292, 296); }
+                  { jjCheckNAddStates(287, 291); }
                   break;
-               case 66:
+               case 29:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 109)
                      kind = 109;
-                  { jjCheckNAddStates(297, 302); }
+                  { jjCheckNAddStates(292, 297); }
                   break;
-               case 67:
+               case 30:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 109)
                      kind = 109;
-                  { jjCheckNAddStates(303, 309); }
+                  { jjCheckNAddStates(298, 304); }
                   break;
-               case 68:
+               case 31:
                   if (curChar == 92)
-                     { jjCheckNAddTwoStates(58, 69); }
+                     { jjCheckNAddTwoStates(21, 32); }
                   break;
-               case 69:
+               case 32:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 109)
                      kind = 109;
-                  { jjCheckNAddStates(310, 314); }
+                  { jjCheckNAddStates(305, 309); }
                   break;
-               case 71:
+               case 34:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 109)
                      kind = 109;
-                  { jjCheckNAddStates(315, 322); }
+                  { jjCheckNAddStates(310, 317); }
                   break;
-               case 72:
+               case 35:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 109)
                      kind = 109;
-                  { jjCheckNAddStates(323, 326); }
+                  { jjCheckNAddStates(318, 321); }
                   break;
-               case 73:
+               case 36:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 109)
                      kind = 109;
-                  { jjCheckNAddStates(327, 331); }
+                  { jjCheckNAddStates(322, 326); }
                   break;
-               case 74:
+               case 37:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 109)
                      kind = 109;
-                  { jjCheckNAddStates(332, 337); }
+                  { jjCheckNAddStates(327, 332); }
                   break;
-               case 75:
+               case 38:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 109)
                      kind = 109;
-                  { jjCheckNAddStates(338, 344); }
+                  { jjCheckNAddStates(333, 339); }
                   break;
-               case 77:
-               case 261:
-               case 269:
-                  if ((0x800000008L & l) != 0L)
-                     { jjCheckNAdd(76); }
+               case 40:
+                  if ((0x10000000100000L & l) != 0L)
+                     { jjCheckNAdd(39); }
                   break;
-               case 78:
-                  if ((0x100000001000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 77;
+               case 41:
+                  if ((0x800000008000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 40;
                   break;
-               case 79:
-                  if ((0x200000002L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 78;
+               case 42:
+                  if ((0x1000000010000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 41;
                   break;
-               case 80:
-                  if ((0x800000008L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 79;
+               case 43:
+                  if ((0x200000002000000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 42;
                   break;
-               case 82:
-                  if ((0x2000000020L & l) != 0L)
-                     { jjAddStates(2197, 2200); }
+               case 44:
+                  if ((0x10000000100L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 43;
                   break;
-               case 85:
-                  { jjAddStates(2201, 2202); }
+               case 46:
+               case 239:
+               case 244:
+               case 972:
+               case 978:
+                  if ((0x400000004000L & l) != 0L)
+                     { jjCheckNAdd(45); }
                   break;
-               case 87:
-               case 88:
-                  { jjCheckNAddTwoStates(88, 89); }
+               case 47:
+                  if ((0x200000002L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 46;
                   break;
-               case 93:
-               case 94:
-                  if ((0x7fffffe87fffffeL & l) != 0L)
-                     { jjCheckNAddStates(356, 361); }
+               case 48:
+                  if ((0x10000000100000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 47;
                   break;
-               case 97:
-                  { jjAddStates(2203, 2204); }
+               case 49:
+                  if ((0x1000000010000L & l) != 0L)
+                     { jjCheckNAdd(45); }
                   break;
-               case 99:
-               case 100:
-                  { jjCheckNAddTwoStates(100, 101); }
+               case 50:
+                  if ((0x100000001000000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 49;
                   break;
-               case 105:
-               case 106:
-                  if ((0x7fffffe87fffffeL & l) != 0L)
-                     { jjCheckNAddStates(374, 376); }
+               case 51:
+                  if ((0x2000000020L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 50;
                   break;
-               case 109:
-               case 110:
+               case 53:
+                  if ((0x200000002000L & l) != 0L)
+                     { jjCheckNAdd(52); }
+                  break;
+               case 54:
+                  if ((0x2000000020L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 53;
+                  break;
+               case 55:
+                  if ((0x4000000040000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 54;
+                  break;
+               case 56:
+                  if ((0x8000000080L & l) != 0L)
+                     { jjCheckNAdd(52); }
+                  break;
+               case 57:
+                  if ((0x800000008000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 56;
+                  break;
+               case 58:
+                  if ((0x100000001000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 57;
+                  break;
+               case 60:
+                  if ((0x2000000020L & l) != 0L)
+                     { jjAddStates(2187, 2190); }
+                  break;
+               case 63:
+                  { jjAddStates(2191, 2192); }
+                  break;
+               case 65:
+               case 66:
+                  { jjCheckNAddTwoStates(66, 67); }
+                  break;
+               case 71:
+               case 72:
                   if ((0x7fffffe87fffffeL & l) != 0L)
-                     { jjCheckNAddStates(382, 387); }
+                     { jjCheckNAddStates(351, 356); }
                   break;
-               case 113:
-                  { jjAddStates(2205, 2206); }
+               case 75:
+                  { jjAddStates(2193, 2194); }
                   break;
-               case 115:
-               case 116:
-                  { jjCheckNAddTwoStates(116, 117); }
+               case 77:
+               case 78:
+                  { jjCheckNAddTwoStates(78, 79); }
                   break;
-               case 121:
+               case 83:
+               case 84:
+                  if ((0x7fffffe87fffffeL & l) != 0L)
+                     { jjCheckNAddStates(369, 371); }
+                  break;
+               case 87:
+               case 88:
+                  if ((0x7fffffe87fffffeL & l) != 0L)
+                     { jjCheckNAddStates(377, 382); }
+                  break;
+               case 91:
+                  { jjAddStates(2195, 2196); }
+                  break;
+               case 93:
+               case 94:
+                  { jjCheckNAddTwoStates(94, 95); }
+                  break;
+               case 99:
                   if (curChar == 92)
-                     { jjCheckNAddTwoStates(122, 133); }
+                     { jjCheckNAddTwoStates(100, 111); }
                   break;
-               case 122:
+               case 100:
                   if ((0xffffff81ffffff81L & l) != 0L)
-                     { jjCheckNAddStates(374, 376); }
+                     { jjCheckNAddStates(369, 371); }
                   break;
-               case 123:
+               case 101:
                   if (curChar == 92)
-                     { jjCheckNAddTwoStates(122, 124); }
+                     { jjCheckNAddTwoStates(100, 102); }
                   break;
-               case 124:
+               case 102:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(400, 405); }
+                     { jjCheckNAddStates(395, 400); }
                   break;
-               case 128:
+               case 106:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(406, 414); }
+                     { jjCheckNAddStates(401, 409); }
                   break;
-               case 129:
+               case 107:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(415, 419); }
+                     { jjCheckNAddStates(410, 414); }
                   break;
-               case 130:
+               case 108:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(420, 425); }
+                     { jjCheckNAddStates(415, 420); }
                   break;
-               case 131:
+               case 109:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(426, 432); }
+                     { jjCheckNAddStates(421, 427); }
                   break;
-               case 132:
+               case 110:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(433, 440); }
+                     { jjCheckNAddStates(428, 435); }
                   break;
-               case 133:
+               case 111:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(441, 446); }
+                     { jjCheckNAddStates(436, 441); }
                   break;
-               case 135:
+               case 113:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(447, 455); }
+                     { jjCheckNAddStates(442, 450); }
                   break;
-               case 136:
+               case 114:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(456, 460); }
+                     { jjCheckNAddStates(451, 455); }
                   break;
-               case 137:
+               case 115:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(461, 466); }
+                     { jjCheckNAddStates(456, 461); }
                   break;
-               case 138:
+               case 116:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(467, 473); }
+                     { jjCheckNAddStates(462, 468); }
                   break;
-               case 139:
+               case 117:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(474, 481); }
+                     { jjCheckNAddStates(469, 476); }
                   break;
-               case 140:
+               case 118:
                   if (curChar == 92)
-                     { jjCheckNAddStates(2207, 2210); }
+                     { jjCheckNAddStates(2197, 2200); }
                   break;
-               case 141:
+               case 119:
                   if ((0xffffff81ffffff81L & l) != 0L)
-                     { jjCheckNAddStates(382, 387); }
+                     { jjCheckNAddStates(377, 382); }
                   break;
-               case 142:
+               case 120:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(482, 489); }
+                     { jjCheckNAddStates(477, 484); }
                   break;
-               case 146:
+               case 124:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(499, 509); }
+                     { jjCheckNAddStates(494, 504); }
                   break;
-               case 147:
+               case 125:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(510, 516); }
+                     { jjCheckNAddStates(505, 511); }
                   break;
-               case 148:
+               case 126:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(517, 524); }
+                     { jjCheckNAddStates(512, 519); }
                   break;
-               case 149:
+               case 127:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(525, 533); }
+                     { jjCheckNAddStates(520, 528); }
                   break;
-               case 150:
+               case 128:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(534, 543); }
+                     { jjCheckNAddStates(529, 538); }
                   break;
-               case 151:
+               case 129:
                   if (curChar == 92)
-                     { jjCheckNAddTwoStates(141, 152); }
+                     { jjCheckNAddTwoStates(119, 130); }
                   break;
-               case 152:
+               case 130:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(544, 551); }
+                     { jjCheckNAddStates(539, 546); }
                   break;
-               case 154:
+               case 132:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(552, 562); }
+                     { jjCheckNAddStates(547, 557); }
                   break;
-               case 155:
+               case 133:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(563, 569); }
+                     { jjCheckNAddStates(558, 564); }
                   break;
-               case 156:
+               case 134:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(570, 577); }
+                     { jjCheckNAddStates(565, 572); }
                   break;
-               case 157:
+               case 135:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(578, 586); }
+                     { jjCheckNAddStates(573, 581); }
                   break;
-               case 158:
+               case 136:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(587, 596); }
+                     { jjCheckNAddStates(582, 591); }
                   break;
-               case 160:
+               case 138:
                   if ((0xffffffffefffffffL & l) != 0L)
-                     { jjCheckNAddStates(597, 599); }
+                     { jjCheckNAddStates(592, 594); }
                   break;
-               case 162:
+               case 140:
                   if (curChar == 92)
-                     { jjAddStates(2211, 2214); }
+                     { jjAddStates(2201, 2204); }
                   break;
-               case 166:
+               case 144:
                   if ((0xffffff81ffffff81L & l) != 0L)
-                     { jjCheckNAddStates(597, 599); }
+                     { jjCheckNAddStates(592, 594); }
                   break;
-               case 167:
+               case 145:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(605, 610); }
+                     { jjCheckNAddStates(600, 605); }
                   break;
-               case 170:
+               case 148:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(611, 619); }
+                     { jjCheckNAddStates(606, 614); }
                   break;
-               case 171:
+               case 149:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(620, 624); }
+                     { jjCheckNAddStates(615, 619); }
                   break;
-               case 172:
+               case 150:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(625, 630); }
+                     { jjCheckNAddStates(620, 625); }
                   break;
-               case 173:
+               case 151:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(631, 637); }
+                     { jjCheckNAddStates(626, 632); }
                   break;
-               case 174:
+               case 152:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(638, 645); }
+                     { jjCheckNAddStates(633, 640); }
                   break;
-               case 176:
+               case 154:
                   if ((0xffffffffefffffffL & l) != 0L)
-                     { jjCheckNAddStates(646, 648); }
+                     { jjCheckNAddStates(641, 643); }
                   break;
-               case 178:
+               case 156:
                   if (curChar == 92)
-                     { jjAddStates(2215, 2218); }
+                     { jjAddStates(2205, 2208); }
                   break;
-               case 182:
+               case 160:
                   if ((0xffffff81ffffff81L & l) != 0L)
-                     { jjCheckNAddStates(646, 648); }
+                     { jjCheckNAddStates(641, 643); }
                   break;
-               case 183:
+               case 161:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(649, 654); }
+                     { jjCheckNAddStates(644, 649); }
                   break;
-               case 186:
+               case 164:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(655, 663); }
+                     { jjCheckNAddStates(650, 658); }
                   break;
-               case 187:
+               case 165:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(664, 668); }
+                     { jjCheckNAddStates(659, 663); }
                   break;
-               case 188:
+               case 166:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(669, 674); }
+                     { jjCheckNAddStates(664, 669); }
                   break;
-               case 189:
+               case 167:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(675, 681); }
+                     { jjCheckNAddStates(670, 676); }
                   break;
-               case 190:
+               case 168:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(682, 689); }
+                     { jjCheckNAddStates(677, 684); }
                   break;
-               case 191:
+               case 169:
                   if (curChar == 92)
-                     { jjCheckNAddStates(2219, 2222); }
+                     { jjCheckNAddStates(2209, 2212); }
                   break;
-               case 192:
+               case 170:
                   if ((0xffffff81ffffff81L & l) != 0L)
-                     { jjCheckNAddStates(356, 361); }
+                     { jjCheckNAddStates(351, 356); }
                   break;
-               case 193:
+               case 171:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(690, 697); }
+                     { jjCheckNAddStates(685, 692); }
                   break;
-               case 197:
+               case 175:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(707, 717); }
+                     { jjCheckNAddStates(702, 712); }
                   break;
-               case 198:
+               case 176:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(718, 724); }
+                     { jjCheckNAddStates(713, 719); }
                   break;
-               case 199:
+               case 177:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(725, 732); }
+                     { jjCheckNAddStates(720, 727); }
                   break;
-               case 200:
+               case 178:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(733, 741); }
+                     { jjCheckNAddStates(728, 736); }
                   break;
-               case 201:
+               case 179:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(742, 751); }
+                     { jjCheckNAddStates(737, 746); }
                   break;
-               case 202:
+               case 180:
                   if (curChar == 92)
-                     { jjCheckNAddTwoStates(192, 203); }
+                     { jjCheckNAddTwoStates(170, 181); }
                   break;
-               case 203:
+               case 181:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(752, 759); }
+                     { jjCheckNAddStates(747, 754); }
                   break;
-               case 205:
+               case 183:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(760, 770); }
+                     { jjCheckNAddStates(755, 765); }
                   break;
-               case 206:
+               case 184:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(771, 777); }
+                     { jjCheckNAddStates(766, 772); }
                   break;
-               case 207:
+               case 185:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(778, 785); }
+                     { jjCheckNAddStates(773, 780); }
                   break;
-               case 208:
+               case 186:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(786, 794); }
+                     { jjCheckNAddStates(781, 789); }
                   break;
-               case 209:
+               case 187:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(795, 804); }
+                     { jjCheckNAddStates(790, 799); }
                   break;
-               case 210:
+               case 188:
                   if ((0x1000000010000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 82;
+                     jjstateSet[jjnewStateCnt++] = 60;
                   break;
-               case 211:
+               case 189:
                   if ((0x200000002000000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 210;
+                     jjstateSet[jjnewStateCnt++] = 188;
                   break;
-               case 212:
+               case 190:
                   if ((0x10000000100000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 211;
+                     jjstateSet[jjnewStateCnt++] = 189;
                   break;
-               case 213:
+               case 191:
                   if ((0x800000008L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 212;
+                     jjstateSet[jjnewStateCnt++] = 190;
                   break;
-               case 214:
+               case 192:
                   if ((0x800000008000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 213;
+                     jjstateSet[jjnewStateCnt++] = 191;
                   break;
-               case 215:
+               case 193:
                   if ((0x1000000010L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 214;
+                     jjstateSet[jjnewStateCnt++] = 192;
                   break;
-               case 220:
-                  { jjAddStates(2223, 2224); }
+               case 198:
+                  { jjAddStates(2213, 2214); }
                   break;
-               case 222:
-               case 223:
-                  { jjCheckNAddTwoStates(223, 224); }
+               case 200:
+               case 201:
+                  { jjCheckNAddTwoStates(201, 202); }
                   break;
-               case 228:
-               case 229:
+               case 206:
+               case 207:
                   if ((0x7fffffe87fffffeL & l) != 0L)
-                     { jjCheckNAddStates(820, 823); }
+                     { jjCheckNAddStates(815, 818); }
                   break;
-               case 232:
-                  { jjAddStates(2225, 2226); }
+               case 210:
+                  { jjAddStates(2215, 2216); }
                   break;
-               case 234:
-               case 235:
-                  { jjCheckNAddTwoStates(235, 236); }
+               case 212:
+               case 213:
+                  { jjCheckNAddTwoStates(213, 214); }
                   break;
-               case 240:
+               case 218:
                   if (curChar == 92)
-                     { jjCheckNAddTwoStates(241, 242); }
+                     { jjCheckNAddTwoStates(219, 220); }
                   break;
-               case 241:
+               case 219:
                   if ((0xffffff81ffffff81L & l) != 0L)
-                     { jjCheckNAddStates(820, 823); }
+                     { jjCheckNAddStates(815, 818); }
                   break;
-               case 242:
+               case 220:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(833, 838); }
+                     { jjCheckNAddStates(828, 833); }
                   break;
-               case 246:
+               case 224:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(845, 853); }
+                     { jjCheckNAddStates(840, 848); }
                   break;
-               case 247:
+               case 225:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(854, 858); }
+                     { jjCheckNAddStates(849, 853); }
                   break;
-               case 248:
+               case 226:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(859, 864); }
+                     { jjCheckNAddStates(854, 859); }
                   break;
-               case 249:
+               case 227:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(865, 871); }
+                     { jjCheckNAddStates(860, 866); }
                   break;
-               case 250:
+               case 228:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(872, 879); }
+                     { jjCheckNAddStates(867, 874); }
                   break;
-               case 251:
+               case 229:
                   if (curChar == 92)
-                     { jjCheckNAddTwoStates(241, 252); }
+                     { jjCheckNAddTwoStates(219, 230); }
                   break;
-               case 252:
+               case 230:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(880, 885); }
+                     { jjCheckNAddStates(875, 880); }
                   break;
-               case 254:
+               case 232:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(886, 894); }
+                     { jjCheckNAddStates(881, 889); }
                   break;
-               case 255:
+               case 233:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(895, 899); }
+                     { jjCheckNAddStates(890, 894); }
                   break;
-               case 256:
+               case 234:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(900, 905); }
+                     { jjCheckNAddStates(895, 900); }
                   break;
-               case 257:
+               case 235:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(906, 912); }
+                     { jjCheckNAddStates(901, 907); }
                   break;
-               case 258:
+               case 236:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(913, 920); }
+                     { jjCheckNAddStates(908, 915); }
                   break;
-               case 262:
-                  if ((0x100000001000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 261;
+               case 238:
+                  if ((0x8000000080000L & l) != 0L)
+                     { jjAddStates(2182, 2184); }
                   break;
-               case 263:
-                  if ((0x200000002L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 262;
+               case 240:
+                  if ((0x20000000200L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 239;
                   break;
-               case 264:
-                  if ((0x800000008L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 263;
+               case 241:
+                  if ((0x10000000100000L & l) != 0L)
+                     { jjCheckNAdd(45); }
                   break;
-               case 266:
-                  if ((0x400000004000000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 265;
+               case 242:
+                  if ((0x4000000040000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 241;
                   break;
-               case 267:
-                  if ((0x800000008000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 266;
+               case 243:
+                  if ((0x2000000020000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 242;
                   break;
-               case 268:
+               case 245:
+                  if ((0x8000000080L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 244;
+                  break;
+               case 246:
+                  if ((0x20000000200L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 245;
+                  break;
+               case 249:
+               case 257:
+               case 959:
+                  if ((0x800000008L & l) != 0L)
+                     { jjCheckNAdd(248); }
+                  break;
+               case 250:
+                  if ((0x100000001000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 249;
+                  break;
+               case 251:
+                  if ((0x200000002L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 250;
+                  break;
+               case 252:
+                  if ((0x800000008L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 251;
+                  break;
+               case 254:
+                  if ((0x400000004000000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 253;
+                  break;
+               case 255:
+                  if ((0x800000008000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 254;
+                  break;
+               case 256:
                   if ((0x200000002000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 267;
+                     jjstateSet[jjnewStateCnt++] = 255;
                   break;
-               case 270:
+               case 258:
                   if ((0x100000001000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 269;
+                     jjstateSet[jjnewStateCnt++] = 257;
                   break;
-               case 271:
+               case 259:
                   if ((0x200000002L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 270;
+                     jjstateSet[jjnewStateCnt++] = 258;
                   break;
-               case 272:
+               case 260:
                   if ((0x800000008L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 271;
+                     jjstateSet[jjnewStateCnt++] = 259;
                   break;
-               case 274:
+               case 262:
                   if ((0x10000000100000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 273;
+                     jjstateSet[jjnewStateCnt++] = 261;
                   break;
-               case 275:
+               case 263:
                   if ((0x20000000200L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 274;
+                     jjstateSet[jjnewStateCnt++] = 262;
                   break;
-               case 276:
+               case 264:
                   if ((0x80000000800L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 275;
+                     jjstateSet[jjnewStateCnt++] = 263;
                   break;
-               case 277:
+               case 265:
                   if ((0x400000004L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 276;
+                     jjstateSet[jjnewStateCnt++] = 264;
                   break;
-               case 278:
+               case 266:
                   if ((0x2000000020L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 277;
+                     jjstateSet[jjnewStateCnt++] = 265;
                   break;
-               case 279:
+               case 267:
                   if ((0x80000000800000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 278;
+                     jjstateSet[jjnewStateCnt++] = 266;
                   break;
+               case 270:
+                  { jjAddStates(2217, 2218); }
+                  break;
+               case 272:
+               case 273:
+                  { jjCheckNAddTwoStates(273, 274); }
+                  break;
+               case 279:
+                  { jjAddStates(2219, 2220); }
+                  break;
+               case 281:
                case 282:
-                  { jjAddStates(2227, 2228); }
+                  { jjCheckNAddTwoStates(282, 283); }
                   break;
-               case 284:
-               case 285:
-                  { jjCheckNAddTwoStates(285, 286); }
+               case 287:
+                  if (curChar == 126)
+                     { jjCheckNAdd(288); }
                   break;
-               case 291:
-                  { jjAddStates(2229, 2230); }
+               case 290:
+                  { jjAddStates(2221, 2222); }
                   break;
+               case 292:
                case 293:
-               case 294:
-                  { jjCheckNAddTwoStates(294, 295); }
+                  { jjCheckNAddTwoStates(293, 294); }
                   break;
                case 299:
-                  if (curChar == 126)
-                     { jjCheckNAdd(300); }
+                  { jjAddStates(2223, 2224); }
                   break;
+               case 301:
                case 302:
-                  { jjAddStates(2231, 2232); }
+                  { jjCheckNAddTwoStates(302, 303); }
                   break;
-               case 304:
-               case 305:
-                  { jjCheckNAddTwoStates(305, 306); }
+               case 308:
+                  { jjAddStates(2225, 2226); }
                   break;
+               case 310:
                case 311:
-                  { jjAddStates(2233, 2234); }
+                  { jjCheckNAddTwoStates(311, 312); }
                   break;
-               case 313:
-               case 314:
-                  { jjCheckNAddTwoStates(314, 315); }
+               case 317:
+                  { jjAddStates(2227, 2228); }
                   break;
+               case 319:
                case 320:
-                  { jjAddStates(2235, 2236); }
+                  { jjCheckNAddTwoStates(320, 321); }
                   break;
-               case 322:
-               case 323:
-                  { jjCheckNAddTwoStates(323, 324); }
+               case 326:
+                  { jjAddStates(2229, 2230); }
                   break;
+               case 328:
                case 329:
-                  { jjAddStates(2237, 2238); }
+                  { jjCheckNAddTwoStates(329, 330); }
                   break;
-               case 331:
-               case 332:
-                  { jjCheckNAddTwoStates(332, 333); }
+               case 335:
+                  { jjAddStates(2231, 2232); }
                   break;
+               case 337:
                case 338:
-                  { jjAddStates(2239, 2240); }
-                  break;
-               case 340:
-               case 341:
-                  { jjCheckNAddTwoStates(341, 342); }
-                  break;
-               case 347:
-                  { jjAddStates(2241, 2242); }
+                  { jjCheckNAddTwoStates(338, 339); }
                   break;
-               case 349:
-               case 350:
-                  { jjCheckNAddTwoStates(350, 351); }
-                  break;
-               case 355:
+               case 343:
                   if (curChar == 126 && kind > 33)
                      kind = 33;
                   break;
-               case 357:
-                  { jjAddStates(2243, 2244); }
+               case 345:
+                  { jjAddStates(2233, 2234); }
                   break;
-               case 359:
-               case 360:
-                  { jjCheckNAddTwoStates(360, 361); }
+               case 347:
+               case 348:
+                  { jjCheckNAddTwoStates(348, 349); }
                   break;
-               case 365:
+               case 353:
                   if (curChar != 126)
                      break;
                   if (kind > 33)
                      kind = 33;
-                  { jjCheckNAdd(300); }
+                  { jjCheckNAdd(288); }
                   break;
-               case 367:
+               case 355:
                   if ((0xffffffffefffffffL & l) != 0L)
-                     { jjCheckNAddStates(999, 1001); }
+                     { jjCheckNAddStates(994, 996); }
                   break;
-               case 369:
+               case 357:
                   if (curChar == 92)
-                     { jjAddStates(2245, 2248); }
+                     { jjAddStates(2235, 2238); }
                   break;
-               case 373:
+               case 361:
                   if ((0xffffff81ffffff81L & l) != 0L)
-                     { jjCheckNAddStates(999, 1001); }
+                     { jjCheckNAddStates(994, 996); }
                   break;
-               case 374:
+               case 362:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(1002, 1007); }
+                     { jjCheckNAddStates(997, 1002); }
                   break;
-               case 377:
+               case 365:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(1008, 1016); }
+                     { jjCheckNAddStates(1003, 1011); }
                   break;
-               case 378:
+               case 366:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(1017, 1021); }
+                     { jjCheckNAddStates(1012, 1016); }
                   break;
-               case 379:
+               case 367:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(1022, 1027); }
+                     { jjCheckNAddStates(1017, 1022); }
                   break;
-               case 380:
+               case 368:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(1028, 1034); }
+                     { jjCheckNAddStates(1023, 1029); }
                   break;
-               case 381:
+               case 369:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(1035, 1042); }
+                     { jjCheckNAddStates(1030, 1037); }
                   break;
-               case 382:
+               case 370:
                   if ((0xffffffffefffffffL & l) == 0L)
                      break;
                   if (kind > 40)
                      kind = 40;
-                  { jjCheckNAddTwoStates(382, 383); }
+                  { jjCheckNAddTwoStates(370, 371); }
                   break;
-               case 383:
+               case 371:
                   if (curChar == 92)
-                     { jjAddStates(2249, 2252); }
+                     { jjAddStates(2239, 2242); }
                   break;
-               case 387:
+               case 375:
                   if ((0xffffff81ffffff81L & l) == 0L)
                      break;
                   if (kind > 40)
                      kind = 40;
-                  { jjCheckNAddTwoStates(382, 383); }
+                  { jjCheckNAddTwoStates(370, 371); }
                   break;
-               case 388:
+               case 376:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 40)
                      kind = 40;
-                  { jjCheckNAddStates(1043, 1047); }
+                  { jjCheckNAddStates(1038, 1042); }
                   break;
-               case 391:
+               case 379:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 40)
                      kind = 40;
-                  { jjCheckNAddStates(1048, 1055); }
+                  { jjCheckNAddStates(1043, 1050); }
                   break;
-               case 392:
+               case 380:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 40)
                      kind = 40;
-                  { jjCheckNAddStates(1056, 1059); }
+                  { jjCheckNAddStates(1051, 1054); }
                   break;
-               case 393:
+               case 381:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 40)
                      kind = 40;
-                  { jjCheckNAddStates(1060, 1064); }
+                  { jjCheckNAddStates(1055, 1059); }
                   break;
-               case 394:
+               case 382:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 40)
                      kind = 40;
-                  { jjCheckNAddStates(1065, 1070); }
+                  { jjCheckNAddStates(1060, 1065); }
                   break;
-               case 395:
+               case 383:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 40)
                      kind = 40;
-                  { jjCheckNAddStates(1071, 1077); }
+                  { jjCheckNAddStates(1066, 1072); }
                   break;
-               case 397:
+               case 385:
                   if ((0xffffffffefffffffL & l) != 0L)
-                     { jjCheckNAddStates(1078, 1080); }
+                     { jjCheckNAddStates(1073, 1075); }
                   break;
-               case 399:
+               case 387:
                   if (curChar == 92)
-                     { jjAddStates(2253, 2256); }
+                     { jjAddStates(2243, 2246); }
                   break;
-               case 403:
+               case 391:
                   if ((0xffffff81ffffff81L & l) != 0L)
-                     { jjCheckNAddStates(1078, 1080); }
+                     { jjCheckNAddStates(1073, 1075); }
                   break;
-               case 404:
+               case 392:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(1081, 1086); }
+                     { jjCheckNAddStates(1076, 1081); }
                   break;
-               case 407:
+               case 395:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(1087, 1095); }
+                     { jjCheckNAddStates(1082, 1090); }
                   break;
-               case 408:
+               case 396:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(1096, 1100); }
+                     { jjCheckNAddStates(1091, 1095); }
                   break;
-               case 409:
+               case 397:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(1101, 1106); }
+                     { jjCheckNAddStates(1096, 1101); }
                   break;
-               case 410:
+               case 398:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(1107, 1113); }
+                     { jjCheckNAddStates(1102, 1108); }
                   break;
-               case 411:
+               case 399:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(1114, 1121); }
+                     { jjCheckNAddStates(1109, 1116); }
                   break;
-               case 412:
+               case 400:
                   if ((0xffffffffefffffffL & l) == 0L)
                      break;
                   if (kind > 40)
                      kind = 40;
-                  { jjCheckNAddTwoStates(412, 413); }
+                  { jjCheckNAddTwoStates(400, 401); }
                   break;
-               case 413:
+               case 401:
                   if (curChar == 92)
-                     { jjAddStates(2257, 2260); }
+                     { jjAddStates(2247, 2250); }
                   break;
-               case 417:
+               case 405:
                   if ((0xffffff81ffffff81L & l) == 0L)
                      break;
                   if (kind > 40)
                      kind = 40;
-                  { jjCheckNAddTwoStates(412, 413); }
+                  { jjCheckNAddTwoStates(400, 401); }
                   break;
-               case 418:
+               case 406:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 40)
                      kind = 40;
-                  { jjCheckNAddStates(1122, 1126); }
+                  { jjCheckNAddStates(1117, 1121); }
                   break;
-               case 421:
+               case 409:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 40)
                      kind = 40;
-                  { jjCheckNAddStates(1127, 1134); }
+                  { jjCheckNAddStates(1122, 1129); }
                   break;
-               case 422:
+               case 410:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 40)
                      kind = 40;
-                  { jjCheckNAddStates(1135, 1138); }
+                  { jjCheckNAddStates(1130, 1133); }
                   break;
-               case 423:
+               case 411:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 40)
                      kind = 40;
-                  { jjCheckNAddStates(1139, 1143); }
+                  { jjCheckNAddStates(1134, 1138); }
                   break;
-               case 424:
+               case 412:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 40)
                      kind = 40;
-                  { jjCheckNAddStates(1144, 1149); }
+                  { jjCheckNAddStates(1139, 1144); }
                   break;
-               case 425:
+               case 413:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 40)
                      kind = 40;
-                  { jjCheckNAddStates(1150, 1156); }
+                  { jjCheckNAddStates(1145, 1151); }
                   break;
-               case 427:
-               case 428:
+               case 415:
+               case 416:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
                   if (kind > 41)
                      kind = 41;
-                  { jjCheckNAddTwoStates(428, 429); }
+                  { jjCheckNAddTwoStates(416, 417); }
                   break;
-               case 429:
+               case 417:
                   if (curChar == 92)
-                     { jjCheckNAddTwoStates(430, 431); }
+                     { jjCheckNAddTwoStates(418, 419); }
                   break;
-               case 430:
+               case 418:
                   if ((0xffffff81ffffff81L & l) == 0L)
                      break;
                   if (kind > 41)
                      kind = 41;
-                  { jjCheckNAddTwoStates(428, 429); }
+                  { jjCheckNAddTwoStates(416, 417); }
                   break;
-               case 431:
+               case 419:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 41)
                      kind = 41;
-                  { jjCheckNAddStates(1157, 1161); }
+                  { jjCheckNAddStates(1152, 1156); }
                   break;
-               case 435:
+               case 423:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 41)
                      kind = 41;
-                  { jjCheckNAddStates(1162, 1169); }
+                  { jjCheckNAddStates(1157, 1164); }
                   break;
-               case 436:
+               case 424:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 41)
                      kind = 41;
-                  { jjCheckNAddStates(1170, 1173); }
+                  { jjCheckNAddStates(1165, 1168); }
                   break;
-               case 437:
+               case 425:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 41)
                      kind = 41;
-                  { jjCheckNAddStates(1174, 1178); }
+                  { jjCheckNAddStates(1169, 1173); }
                   break;
-               case 438:
+               case 426:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 41)
                      kind = 41;
-                  { jjCheckNAddStates(1179, 1184); }
+                  { jjCheckNAddStates(1174, 1179); }
                   break;
-               case 439:
+               case 427:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 41)
                      kind = 41;
-                  { jjCheckNAddStates(1185, 1191); }
+                  { jjCheckNAddStates(1180, 1186); }
                   break;
-               case 441:
-               case 442:
+               case 429:
+               case 430:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
                   if (kind > 45)
                      kind = 45;
-                  { jjCheckNAddTwoStates(442, 443); }
+                  { jjCheckNAddTwoStates(430, 431); }
                   break;
-               case 443:
+               case 431:
                   if (curChar == 92)
-                     { jjCheckNAddTwoStates(444, 445); }
+                     { jjCheckNAddTwoStates(432, 433); }
                   break;
-               case 444:
+               case 432:
                   if ((0xffffff81ffffff81L & l) == 0L)
                      break;
                   if (kind > 45)
                      kind = 45;
-                  { jjCheckNAddTwoStates(442, 443); }
+                  { jjCheckNAddTwoStates(430, 431); }
                   break;
-               case 445:
+               case 433:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 45)
                      kind = 45;
-                  { jjCheckNAddStates(1194, 1198); }
+                  { jjCheckNAddStates(1189, 1193); }
                   break;
-               case 449:
+               case 437:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 45)
                      kind = 45;
-                  { jjCheckNAddStates(1199, 1206); }
+                  { jjCheckNAddStates(1194, 1201); }
                   break;
-               case 450:
+               case 438:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 45)
                      kind = 45;
-                  { jjCheckNAddStates(1207, 1210); }
+                  { jjCheckNAddStates(1202, 1205); }
                   break;
-               case 451:
+               case 439:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 45)
                      kind = 45;
-                  { jjCheckNAddStates(1211, 1215); }
+                  { jjCheckNAddStates(1206, 1210); }
                   break;
-               case 452:
+               case 440:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 45)
                      kind = 45;
-                  { jjCheckNAddStates(1216, 1221); }
+                  { jjCheckNAddStates(1211, 1216); }
                   break;
-               case 453:
+               case 441:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 45)
                      kind = 45;
-                  { jjCheckNAddStates(1222, 1228); }
+                  { jjCheckNAddStates(1217, 1223); }
                   break;
-               case 454:
+               case 442:
                   if (curChar == 92)
-                     { jjCheckNAddTwoStates(444, 455); }
+                     { jjCheckNAddTwoStates(432, 443); }
                   break;
-               case 455:
+               case 443:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 45)
                      kind = 45;
-                  { jjCheckNAddStates(1229, 1233); }
+                  { jjCheckNAddStates(1224, 1228); }
                   break;
-               case 457:
+               case 445:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 45)
                      kind = 45;
-                  { jjCheckNAddStates(1234, 1241); }
+                  { jjCheckNAddStates(1229, 1236); }
                   break;
-               case 458:
+               case 446:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 45)
                      kind = 45;
-                  { jjCheckNAddStates(1242, 1245); }
+                  { jjCheckNAddStates(1237, 1240); }
                   break;
-               case 459:
+               case 447:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 45)
                      kind = 45;
-                  { jjCheckNAddStates(1246, 1250); }
+                  { jjCheckNAddStates(1241, 1245); }
                   break;
-               case 460:
+               case 448:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 45)
                      kind = 45;
-                  { jjCheckNAddStates(1251, 1256); }
+                  { jjCheckNAddStates(1246, 1251); }
                   break;
-               case 461:
+               case 449:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 45)
                      kind = 45;
-                  { jjCheckNAddStates(1257, 1263); }
+                  { jjCheckNAddStates(1252, 1258); }
                   break;
-               case 462:
-               case 463:
+               case 450:
+               case 451:
                   if ((0x7fffffe87fffffeL & l) != 0L)
-                     { jjCheckNAddStates(1264, 1266); }
+                     { jjCheckNAddStates(1259, 1261); }
                   break;
-               case 465:
+               case 453:
                   if (curChar == 92)
-                     { jjCheckNAddTwoStates(466, 467); }
+                     { jjCheckNAddTwoStates(454, 455); }
                   break;
-               case 466:
+               case 454:
                   if ((0xffffff81ffffff81L & l) != 0L)
-                     { jjCheckNAddStates(1264, 1266); }
+                     { jjCheckNAddStates(1259, 1261); }
                   break;
-               case 467:
+               case 455:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(1267, 1272); }
+                     { jjCheckNAddStates(1262, 1267); }
                   break;
-               case 471:
+               case 459:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(1273, 1281); }
+                     { jjCheckNAddStates(1268, 1276); }
                   break;
-               case 472:
+               case 460:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(1282, 1286); }
+                     { jjCheckNAddStates(1277, 1281); }
                   break;
-               case 473:
+               case 461:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(1287, 1292); }
+                     { jjCheckNAddStates(1282, 1287); }
                   break;
-               case 474:
+               case 462:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(1293, 1299); }
+                     { jjCheckNAddStates(1288, 1294); }
                   break;
-               case 475:
+               case 463:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(1300, 1307); }
+                     { jjCheckNAddStates(1295, 1302); }
                   break;
-               case 476:
+               case 464:
                   if (curChar == 92)
-                     { jjCheckNAddTwoStates(466, 477); }
+                     { jjCheckNAddTwoStates(454, 465); }
                   break;
-               case 477:
+               case 465:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(1308, 1313); }
+                     { jjCheckNAddStates(1303, 1308); }
                   break;
-               case 479:
+               case 467:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(1314, 1322); }
+                     { jjCheckNAddStates(1309, 1317); }
                   break;
-               case 480:
+               case 468:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(1323, 1327); }
+                     { jjCheckNAddStates(1318, 1322); }
                   break;
-               case 481:
+               case 469:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(1328, 1333); }
+                     { jjCheckNAddStates(1323, 1328); }
                   break;
-               case 482:
+               case 470:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(1334, 1340); }
+                     { jjCheckNAddStates(1329, 1335); }
                   break;
-               case 483:
+               case 471:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(1341, 1348); }
+                     { jjCheckNAddStates(1336, 1343); }
                   break;
-               case 484:
+               case 472:
                   if (curChar == 92)
-                     { jjCheckNAddTwoStates(430, 485); }
+                     { jjCheckNAddTwoStates(418, 473); }
                   break;
-               case 485:
+               case 473:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 41)
                      kind = 41;
-                  { jjCheckNAddStates(1349, 1353); }
+                  { jjCheckNAddStates(1344, 1348); }
                   break;
-               case 487:
+               case 475:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 41)
                      kind = 41;
-                  { jjCheckNAddStates(1354, 1361); }
+                  { jjCheckNAddStates(1349, 1356); }
                   break;
-               case 488:
+               case 476:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 41)
                      kind = 41;
-                  { jjCheckNAddStates(1362, 1365); }
+                  { jjCheckNAddStates(1357, 1360); }
                   break;
-               case 489:
+               case 477:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 41)
                      kind = 41;
-                  { jjCheckNAddStates(1366, 1370); }
+                  { jjCheckNAddStates(1361, 1365); }
                   break;
-               case 490:
+               case 478:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 41)
                      kind = 41;
-                  { jjCheckNAddStates(1371, 1376); }
+                  { jjCheckNAddStates(1366, 1371); }
                   break;
-               case 491:
+               case 479:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 41)
                      kind = 41;
-                  { jjCheckNAddStates(1377, 1383); }
+                  { jjCheckNAddStates(1372, 1378); }
                   break;
-               case 492:
+               case 480:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
                   if (kind > 41)
                      kind = 41;
-                  { jjCheckNAddStates(2180, 2184); }
+                  { jjCheckNAddStates(2155, 2159); }
                   break;
-               case 495:
-               case 496:
+               case 483:
+               case 484:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
                   if (kind > 42)
                      kind = 42;
-                  { jjCheckNAddTwoStates(496, 497); }
+                  { jjCheckNAddTwoStates(484, 485); }
                   break;
-               case 497:
+               case 485:
                   if (curChar == 92)
-                     { jjCheckNAddTwoStates(498, 499); }
+                     { jjCheckNAddTwoStates(486, 487); }
                   break;
-               case 498:
+               case 486:
                   if ((0xffffff81ffffff81L & l) == 0L)
                      break;
                   if (kind > 42)
                      kind = 42;
-                  { jjCheckNAddTwoStates(496, 497); }
+                  { jjCheckNAddTwoStates(484, 485); }
                   break;
-               case 499:
+               case 487:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 42)
                      kind = 42;
-                  { jjCheckNAddStates(1384, 1388); }
+                  { jjCheckNAddStates(1379, 1383); }
                   break;
-               case 503:
+               case 491:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 42)
                      kind = 42;
-                  { jjCheckNAddStates(1389, 1396); }
+                  { jjCheckNAddStates(1384, 1391); }
                   break;
-               case 504:
+               case 492:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 42)
                      kind = 42;
-                  { jjCheckNAddStates(1397, 1400); }
+                  { jjCheckNAddStates(1392, 1395); }
                   break;
-               case 505:
+               case 493:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 42)
                      kind = 42;
-                  { jjCheckNAddStates(1401, 1405); }
+                  { jjCheckNAddStates(1396, 1400); }
                   break;
-               case 506:
+               case 494:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 42)
                      kind = 42;
-                  { jjCheckNAddStates(1406, 1411); }
+                  { jjCheckNAddStates(1401, 1406); }
                   break;
-               case 507:
+               case 495:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 42)
                      kind = 42;
-                  { jjCheckNAddStates(1412, 1418); }
+                  { jjCheckNAddStates(1407, 1413); }
                   break;
-               case 508:
+               case 496:
                   if (curChar == 92)
-                     { jjCheckNAddTwoStates(498, 509); }
+                     { jjCheckNAddTwoStates(486, 497); }
                   break;
-               case 509:
+               case 497:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 42)
                      kind = 42;
-                  { jjCheckNAddStates(1419, 1423); }
+                  { jjCheckNAddStates(1414, 1418); }
                   break;
-               case 511:
+               case 499:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 42)
                      kind = 42;
-                  { jjCheckNAddStates(1424, 1431); }
+                  { jjCheckNAddStates(1419, 1426); }
                   break;
-               case 512:
+               case 500:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 42)
                      kind = 42;
-                  { jjCheckNAddStates(1432, 1435); }
+                  { jjCheckNAddStates(1427, 1430); }
                   break;
-               case 513:
+               case 501:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 42)
                      kind = 42;
-                  { jjCheckNAddStates(1436, 1440); }
+                  { jjCheckNAddStates(1431, 1435); }
                   break;
-               case 514:
+               case 502:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 42)
                      kind = 42;
-                  { jjCheckNAddStates(1441, 1446); }
+                  { jjCheckNAddStates(1436, 1441); }
                   break;
-               case 515:
+               case 503:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 42)
                      kind = 42;
-                  { jjCheckNAddStates(1447, 1453); }
+                  { jjCheckNAddStates(1442, 1448); }
                   break;
-               case 516:
+               case 504:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
                   if (kind > 43)
                      kind = 43;
-                  { jjCheckNAddTwoStates(516, 517); }
+                  { jjCheckNAddTwoStates(504, 505); }
                   break;
-               case 517:
+               case 505:
                   if (curChar == 92)
-                     { jjAddStates(2261, 2262); }
+                     { jjAddStates(2251, 2252); }
                   break;
-               case 518:
+               case 506:
                   if ((0xffffff81ffffff81L & l) == 0L)
                      break;
                   if (kind > 43)
                      kind = 43;
-                  { jjCheckNAddTwoStates(516, 517); }
+                  { jjCheckNAddTwoStates(504, 505); }
                   break;
-               case 519:
+               case 507:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 43)
                      kind = 43;
-                  { jjCheckNAddStates(1454, 1458); }
+                  { jjCheckNAddStates(1449, 1453); }
                   break;
-               case 523:
+               case 511:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 43)
                      kind = 43;
-                  { jjCheckNAddStates(1459, 1466); }
+                  { jjCheckNAddStates(1454, 1461); }
                   break;
-               case 524:
+               case 512:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 43)
                      kind = 43;
-                  { jjCheckNAddStates(1467, 1470); }
+                  { jjCheckNAddStates(1462, 1465); }
                   break;
-               case 525:
+               case 513:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 43)
                      kind = 43;
-                  { jjCheckNAddStates(1471, 1475); }
+                  { jjCheckNAddStates(1466, 1470); }
                   break;
-               case 526:
+               case 514:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 43)
                      kind = 43;
-                  { jjCheckNAddStates(1476, 1481); }
+                  { jjCheckNAddStates(1471, 1476); }
                   break;
-               case 527:
+               case 515:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 43)
                      kind = 43;
-                  { jjCheckNAddStates(1482, 1488); }
+                  { jjCheckNAddStates(1477, 1483); }
+                  break;
+               case 516:
+                  if ((0x1000000010000L & l) != 0L)
+                     { jjAddStates(2180, 2181); }
+                  break;
+               case 518:
+                  if ((0x7fffffe07fffffeL & l) != 0L)
+                     { jjCheckNAddTwoStates(518, 519); }
+                  break;
+               case 519:
+                  { jjCheckNAddTwoStates(519, 520); }
+                  break;
+               case 521:
+                  if ((0x10000000100000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 517;
+                  break;
+               case 522:
+                  if ((0x4000000040L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 521;
+                  break;
+               case 523:
+                  if ((0x800000008000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 522;
+                  break;
+               case 524:
+                  if ((0x8000000080000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 523;
+                  break;
+               case 525:
+                  if ((0x800000008000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 524;
+                  break;
+               case 526:
+                  if ((0x4000000040000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 525;
+                  break;
+               case 527:
+                  if ((0x800000008L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 526;
                   break;
                case 528:
-                  if ((0x20000000200000L & l) != 0L)
-                     { jjAddStates(2192, 2194); }
+                  if ((0x20000000200L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 527;
+                  break;
+               case 529:
+                  if ((0x200000002000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 528;
                   break;
                case 531:
-                  if ((0xffffffffefffffffL & l) != 0L)
-                     { jjCheckNAddStates(1495, 1497); }
+                  if ((0x200000002000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 530;
+                  break;
+               case 532:
+                  if ((0x4000000040000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 531;
+                  break;
+               case 533:
+                  if ((0x800000008000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 532;
+                  break;
+               case 534:
+                  if ((0x4000000040L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 533;
                   break;
                case 535:
-                  { jjAddStates(2263, 2264); }
+                  if ((0x8000000080000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 534;
+                  break;
+               case 536:
+                  if ((0x400000004000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 535;
                   break;
                case 537:
+                  if ((0x200000002L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 536;
+                  break;
                case 538:
-                  { jjCheckNAddTwoStates(538, 539); }
+                  if ((0x4000000040000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 537;
+                  break;
+               case 539:
+                  if ((0x10000000100000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 538;
+                  break;
+               case 540:
+                  if ((0x2000000020L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 539;
+                  break;
+               case 541:
+                  if ((0x8000000080L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 540;
+                  break;
+               case 542:
+                  if ((0x200000002L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 541;
                   break;
                case 543:
-                  if (curChar == 92)
-                     { jjAddStates(2265, 2268); }
+                  if ((0x200000002000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 542;
                   break;
-               case 547:
-                  if ((0xffffff81ffffff81L & l) != 0L)
-                     { jjCheckNAddStates(1495, 1497); }
+               case 544:
+                  if ((0x20000000200L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 543;
+                  break;
+               case 545:
+                  if ((0x100000001000000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 544;
+                  break;
+               case 546:
+                  if ((0x1000000010L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 545;
                   break;
                case 548:
-                  if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(1507, 1512); }
+                  if ((0x1000000010L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 547;
+                  break;
+               case 549:
+                  if ((0x20000000200L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 548;
+                  break;
+               case 550:
+                  if ((0x8000000080L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 549;
                   break;
                case 551:
-                  if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(1513, 1521); }
+                  if ((0x800000008000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 550;
                   break;
                case 552:
-                  if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(1522, 1526); }
+                  if ((0x4000000040000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 551;
                   break;
                case 553:
-                  if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(1527, 1532); }
+                  if ((0x80000000800000L & l) != 0L)
+                     { jjCheckNAdd(52); }
                   break;
                case 554:
-                  if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(1533, 1539); }
+                  if ((0x800000008000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 553;
                   break;
                case 555:
-                  if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(1540, 1547); }
+                  if ((0x20000000200000L & l) != 0L)
+                     { jjAddStates(2177, 2179); }
                   break;
-               case 557:
+               case 558:
                   if ((0xffffffffefffffffL & l) != 0L)
-                     { jjCheckNAddStates(1548, 1550); }
+                     { jjCheckNAddStates(1492, 1494); }
                   break;
-               case 559:
+               case 562:
+                  { jjAddStates(2253, 2254); }
+                  break;
+               case 564:
+               case 565:
+                  { jjCheckNAddTwoStates(565, 566); }
+                  break;
+               case 570:
                   if (curChar == 92)
-                     { jjAddStates(2269, 2272); }
+                     { jjAddStates(2255, 2258); }
                   break;
-               case 563:
+               case 574:
                   if ((0xffffff81ffffff81L & l) != 0L)
-                     { jjCheckNAddStates(1548, 1550); }
+                     { jjCheckNAddStates(1492, 1494); }
                   break;
-               case 564:
+               case 575:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(1551, 1556); }
+                     { jjCheckNAddStates(1504, 1509); }
                   break;
-               case 567:
+               case 578:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(1557, 1565); }
+                     { jjCheckNAddStates(1510, 1518); }
                   break;
-               case 568:
+               case 579:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(1566, 1570); }
+                     { jjCheckNAddStates(1519, 1523); }
                   break;
-               case 569:
+               case 580:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(1571, 1576); }
+                     { jjCheckNAddStates(1524, 1529); }
                   break;
-               case 570:
+               case 581:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(1577, 1583); }
+                     { jjCheckNAddStates(1530, 1536); }
                   break;
-               case 571:
+               case 582:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(1584, 1591); }
+                     { jjCheckNAddStates(1537, 1544); }
                   break;
-               case 572:
-                  if ((0x7fffffffefffffffL & l) != 0L)
-                     { jjCheckNAddStates(1592, 1595); }
+               case 584:
+                  if ((0xffffffffefffffffL & l) != 0L)
+                     { jjCheckNAddStates(1545, 1547); }
                   break;
-               case 573:
+               case 586:
                   if (curChar == 92)
-                     { jjAddStates(2273, 2274); }
+                     { jjAddStates(2259, 2262); }
                   break;
-               case 574:
+               case 590:
                   if ((0xffffff81ffffff81L & l) != 0L)
-                     { jjCheckNAddStates(1592, 1595); }
+                     { jjCheckNAddStates(1545, 1547); }
                   break;
-               case 575:
+               case 591:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(1596, 1601); }
+                     { jjCheckNAddStates(1548, 1553); }
                   break;
-               case 579:
+               case 594:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(1608, 1616); }
+                     { jjCheckNAddStates(1554, 1562); }
                   break;
-               case 580:
+               case 595:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(1617, 1621); }
+                     { jjCheckNAddStates(1563, 1567); }
                   break;
-               case 581:
+               case 596:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(1622, 1627); }
+                     { jjCheckNAddStates(1568, 1573); }
                   break;
-               case 582:
+               case 597:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(1628, 1634); }
+                     { jjCheckNAddStates(1574, 1580); }
                   break;
-               case 583:
+               case 598:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(1635, 1642); }
-                  break;
-               case 586:
-                  { jjAddStates(2275, 2276); }
+                     { jjCheckNAddStates(1581, 1588); }
                   break;
-               case 588:
-               case 589:
-                  { jjCheckNAddTwoStates(589, 590); }
+               case 599:
+                  if ((0x7fffffffefffffffL & l) != 0L)
+                     { jjCheckNAddStates(1589, 1592); }
                   break;
-               case 593:
-                  if ((0x100000001000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 529;
+               case 600:
+                  if (curChar == 92)
+                     { jjAddStates(2263, 2264); }
                   break;
-               case 594:
-                  if ((0x4000000040000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 593;
+               case 601:
+                  if ((0xffffff81ffffff81L & l) != 0L)
+                     { jjCheckNAddStates(1589, 1592); }
                   break;
                case 602:
-                  if ((0x7e0000007eL & l) == 0L)
-                     break;
-                  if (kind > 119)
-                     kind = 119;
-                  { jjAddStates(1674, 1679); }
+                  if ((0x7e0000007eL & l) != 0L)
+                     { jjCheckNAddStates(1593, 1598); }
                   break;
-               case 603:
+               case 606:
                   if ((0x7e0000007eL & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 604;
+                     { jjCheckNAddStates(1605, 1613); }
                   break;
-               case 604:
+               case 607:
                   if ((0x7e0000007eL & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 605;
+                     { jjCheckNAddStates(1614, 1618); }
                   break;
-               case 605:
+               case 608:
                   if ((0x7e0000007eL & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 606;
+                     { jjCheckNAddStates(1619, 1624); }
                   break;
-               case 606:
+               case 609:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAdd(607); }
+                     { jjCheckNAddStates(1625, 1631); }
                   break;
-               case 607:
+               case 610:
+                  if ((0x7e0000007eL & l) != 0L)
+                     { jjCheckNAddStates(1632, 1639); }
+                  break;
+               case 613:
+                  { jjAddStates(2265, 2266); }
+                  break;
+               case 615:
+               case 616:
+                  { jjCheckNAddTwoStates(616, 617); }
+                  break;
+               case 620:
+                  if ((0x100000001000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 556;
+                  break;
+               case 621:
+                  if ((0x4000000040000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 620;
+                  break;
+               case 629:
+                  if ((0x7e0000007eL & l) == 0L)
+                     break;
+                  if (kind > 119)
+                     kind = 119;
+                  { jjAddStates(1671, 1676); }
+                  break;
+               case 630:
+                  if ((0x7e0000007eL & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 631;
+                  break;
+               case 631:
+                  if ((0x7e0000007eL & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 632;
+                  break;
+               case 632:
+                  if ((0x7e0000007eL & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 633;
+                  break;
+               case 633:
+                  if ((0x7e0000007eL & l) != 0L)
+                     { jjCheckNAdd(634); }
+                  break;
+               case 634:
                   if ((0x7e0000007eL & l) != 0L && kind > 119)
                      kind = 119;
                   break;
-               case 608:
+               case 635:
                   if ((0x7e0000007eL & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 609;
+                     jjstateSet[jjnewStateCnt++] = 636;
                   break;
-               case 609:
+               case 636:
                   if ((0x7e0000007eL & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 610;
+                     jjstateSet[jjnewStateCnt++] = 637;
                   break;
-               case 610:
+               case 637:
                   if ((0x7e0000007eL & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 611;
+                     jjstateSet[jjnewStateCnt++] = 638;
                   break;
-               case 611:
+               case 638:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 119)
                      kind = 119;
-                  jjstateSet[jjnewStateCnt++] = 598;
+                  jjstateSet[jjnewStateCnt++] = 625;
                   break;
-               case 612:
+               case 639:
                   if ((0x7e0000007eL & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 613;
+                     jjstateSet[jjnewStateCnt++] = 640;
                   break;
-               case 613:
+               case 640:
                   if ((0x7e0000007eL & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 614;
+                     jjstateSet[jjnewStateCnt++] = 641;
                   break;
-               case 614:
+               case 641:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 119)
                      kind = 119;
-                  jjstateSet[jjnewStateCnt++] = 615;
+                  jjstateSet[jjnewStateCnt++] = 642;
                   break;
-               case 616:
+               case 643:
                   if ((0x7e0000007eL & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 617;
+                     jjstateSet[jjnewStateCnt++] = 644;
                   break;
-               case 617:
+               case 644:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 119)
                      kind = 119;
-                  jjstateSet[jjnewStateCnt++] = 618;
+                  jjstateSet[jjnewStateCnt++] = 645;
                   break;
-               case 620:
+               case 647:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 119)
                      kind = 119;
-                  jjstateSet[jjnewStateCnt++] = 621;
+                  jjstateSet[jjnewStateCnt++] = 648;
                   break;
-               case 629:
+               case 656:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddTwoStates(630, 636); }
+                     { jjCheckNAddTwoStates(657, 663); }
                   break;
-               case 631:
+               case 658:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 119)
                      kind = 119;
-                  jjstateSet[jjnewStateCnt++] = 632;
+                  jjstateSet[jjnewStateCnt++] = 659;
                   break;
-               case 632:
+               case 659:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 119)
                      kind = 119;
-                  { jjCheckNAddStates(1690, 1693); }
+                  { jjCheckNAddStates(1687, 1690); }
                   break;
-               case 633:
+               case 660:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 119)
                      kind = 119;
-                  { jjCheckNAdd(607); }
+                  { jjCheckNAdd(634); }
                   break;
-               case 634:
+               case 661:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 119)
                      kind = 119;
-                  { jjCheckNAddTwoStates(607, 633); }
+                  { jjCheckNAddTwoStates(634, 660); }
                   break;
-               case 635:
+               case 662:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 119)
                      kind = 119;
-                  { jjCheckNAddStates(1694, 1696); }
+                  { jjCheckNAddStates(1691, 1693); }
                   break;
-               case 636:
+               case 663:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(1697, 1701); }
+                     { jjCheckNAddStates(1694, 1698); }
                   break;
-               case 637:
+               case 664:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAdd(630); }
+                     { jjCheckNAdd(657); }
                   break;
-               case 638:
+               case 665:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddTwoStates(637, 630); }
+                     { jjCheckNAddTwoStates(664, 657); }
                   break;
-               case 639:
+               case 666:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(1702, 1704); }
+                     { jjCheckNAddStates(1699, 1701); }
                   break;
-               case 640:
+               case 667:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(1705, 1708); }
+                     { jjCheckNAddStates(1702, 1705); }
                   break;
-               case 643:
+               case 670:
                   if ((0x2000000020L & l) != 0L)
-                     { jjAddStates(2277, 2278); }
+                     { jjAddStates(2267, 2268); }
                   break;
-               case 646:
+               case 673:
+                  if ((0x4000000040000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 675;
+                  break;
+               case 674:
                   if ((0x200000002000L & l) != 0L && kind > 61)
                      kind = 61;
                   break;
-               case 647:
-               case 688:
+               case 675:
                   if ((0x2000000020L & l) != 0L)
-                     { jjCheckNAdd(646); }
+                     jjstateSet[jjnewStateCnt++] = 674;
                   break;
-               case 649:
+               case 677:
                   if ((0x2000000020L & l) != 0L)
-                     { jjAddStates(2279, 2280); }
+                     { jjAddStates(2269, 2270); }
                   break;
-               case 652:
+               case 680:
+                  if ((0x4000000040000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 682;
+                  break;
+               case 681:
                   if ((0x100000001000000L & l) != 0L && kind > 61)
                      kind = 61;
                   break;
-               case 653:
+               case 682:
                   if ((0x2000000020L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 652;
+                     jjstateSet[jjnewStateCnt++] = 681;
                   break;
-               case 655:
+               case 684:
                   if ((0x2000000020L & l) != 0L)
-                     { jjAddStates(2281, 2282); }
+                     { jjAddStates(2271, 2272); }
                   break;
-               case 658:
+               case 687:
+                  if ((0x4000000040000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 690;
+                  break;
+               case 688:
                   if ((0x1000000010000L & l) != 0L && kind > 61)
                      kind = 61;
                   break;
-               case 659:
+               case 689:
                   if ((0x200000002L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 658;
+                     jjstateSet[jjnewStateCnt++] = 688;
                   break;
-               case 660:
+               case 690:
                   if ((0x800000008L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 659;
+                     jjstateSet[jjnewStateCnt++] = 689;
                   break;
-               case 662:
+               case 692:
                   if ((0x2000000020L & l) != 0L)
-                     { jjAddStates(2283, 2284); }
+                     { jjAddStates(2273, 2274); }
                   break;
-               case 665:
+               case 695:
+                  if ((0x4000000040000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 697;
+                  break;
+               case 696:
                   if ((0x10000000100L & l) != 0L && kind > 61)
                      kind = 61;
                   break;
-               case 666:
+               case 697:
                   if ((0x800000008L & l) != 0L)
-                     { jjCheckNAdd(665); }
+                     { jjCheckNAdd(696); }
                   break;
-               case 668:
+               case 699:
                   if ((0x2000000020L & l) != 0L)
-                     { jjAddStates(2285, 2286); }
+                     { jjAddStates(2275, 2276); }
                   break;
-               case 671:
+               case 702:
+                  if ((0x4000000040000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 704;
+                  break;
+               case 703:
                   if ((0x800000008L & l) != 0L && kind > 61)
                      kind = 61;
                   break;
-               case 672:
+               case 704:
                   if ((0x20000000200L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 671;
-                  break;
-               case 674:
-                  if ((0x2000000020L & l) != 0L)
-                     { jjAddStates(2287, 2288); }
-                  break;
-               case 677:
-               case 682:
-                  if ((0x100000001000L & l) != 0L)
-                     { jjCheckNAdd(665); }
+                     jjstateSet[jjnewStateCnt++] = 703;
                   break;
-               case 679:
+               case 706:
                   if ((0x2000000020L & l) != 0L)
-                     { jjAddStates(2289, 2290); }
+                     { jjAddStates(2277, 2278); }
                   break;
-               case 683:
+               case 709:
                   if ((0x4000000040000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 682;
-                  break;
-               case 685:
-                  if ((0x2000000020L & l) != 0L)
-                     { jjAddStates(2291, 2292); }
+                     jjstateSet[jjnewStateCnt++] = 710;
                   break;
-               case 689:
-                  if ((0x4000000040000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 688;
+               case 710:
+                  if ((0x100000001000L & l) != 0L)
+                     { jjCheckNAdd(696); }
                   break;
-               case 691:
+               case 712:
                   if ((0x2000000020L & l) != 0L)
-                     { jjAddStates(2293, 2294); }
+                     { jjAddStates(2279, 2280); }
                   break;
-               case 694:
+               case 715:
+                  if ((0x8101000081010L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 717;
+                  break;
+               case 716:
                   if ((0x80000000800000L & l) != 0L && kind > 62)
                      kind = 62;
                   break;
-               case 695:
+               case 717:
                   if ((0x40000000400000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 694;
+                     jjstateSet[jjnewStateCnt++] = 716;
                   break;
-               case 697:
+               case 719:
                   if ((0x2000000020L & l) != 0L)
-                     { jjAddStates(2295, 2296); }
+                     { jjAddStates(2281, 2282); }
                   break;
-               case 700:
+               case 722:
+                  if ((0x8101000081010L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 724;
+                  break;
+               case 723:
                   if ((0x10000000100L & l) != 0L && kind > 62)
                      kind = 62;
                   break;
-               case 701:
+               case 724:
                   if ((0x40000000400000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 700;
+                     jjstateSet[jjnewStateCnt++] = 723;
                   break;
-               case 703:
+               case 726:
                   if ((0x2000000020L & l) != 0L)
-                     { jjAddStates(2297, 2298); }
+                     { jjAddStates(2283, 2284); }
                   break;
-               case 706:
+               case 729:
+                  if ((0x8101000081010L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 731;
+                  break;
+               case 730:
                   if ((0x20000000200L & l) != 0L && kind > 62)
                      kind = 62;
                   break;
-               case 707:
+               case 731:
                   if ((0x40000000400000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 706;
+                     jjstateSet[jjnewStateCnt++] = 730;
                   break;
-               case 709:
+               case 733:
                   if ((0x2000000020L & l) != 0L)
-                     { jjAddStates(2299, 2300); }
+                     { jjAddStates(2285, 2286); }
                   break;
-               case 712:
+               case 736:
+                  if ((0x8101000081010L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 738;
+                  break;
+               case 737:
                   if ((0x400000004L & l) != 0L && kind > 62)
                      kind = 62;
                   break;
-               case 713:
+               case 738:
                   if ((0x40000000400000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 712;
+                     jjstateSet[jjnewStateCnt++] = 737;
                   break;
-               case 715:
+               case 740:
                   if ((0x2000000020L & l) != 0L)
-                     { jjAddStates(2301, 2302); }
+                     { jjAddStates(2287, 2288); }
                   break;
-               case 718:
+               case 743:
+                  if ((0x8101000081010L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 747;
+                  break;
+               case 744:
                   if ((0x400000004000L & l) != 0L && kind > 62)
                      kind = 62;
                   break;
-               case 719:
+               case 745:
                   if ((0x20000000200L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 718;
+                     jjstateSet[jjnewStateCnt++] = 744;
                   break;
-               case 720:
+               case 746:
                   if ((0x200000002000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 719;
+                     jjstateSet[jjnewStateCnt++] = 745;
                   break;
-               case 721:
+               case 747:
                   if ((0x40000000400000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 720;
+                     jjstateSet[jjnewStateCnt++] = 746;
                   break;
-               case 723:
+               case 749:
                   if ((0x2000000020L & l) != 0L)
-                     { jjAddStates(2303, 2304); }
+                     { jjAddStates(2289, 2290); }
                   break;
-               case 726:
+               case 752:
+                  if ((0x8101000081010L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 756;
+                  break;
+               case 753:
                   if ((0x100000001000000L & l) != 0L && kind > 62)
                      kind = 62;
                   break;
-               case 727:
+               case 754:
                   if ((0x200000002L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 726;
+                     jjstateSet[jjnewStateCnt++] = 753;
                   break;
-               case 728:
+               case 755:
                   if ((0x200000002000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 727;
+                     jjstateSet[jjnewStateCnt++] = 754;
                   break;
-               case 729:
+               case 756:
                   if ((0x40000000400000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 728;
+                     jjstateSet[jjnewStateCnt++] = 755;
                   break;
-               case 731:
+               case 758:
                   if ((0x2000000020L & l) != 0L)
-                     { jjAddStates(2305, 2306); }
+                     { jjAddStates(2291, 2292); }
                   break;
-               case 734:
+               case 761:
                   if ((0x200000002000L & l) != 0L && kind > 63)
                      kind = 63;
                   break;
-               case 735:
+               case 762:
                   if ((0x800000008L & l) != 0L)
-                     { jjCheckNAdd(734); }
+                     { jjCheckNAdd(761); }
                   break;
-               case 737:
+               case 764:
                   if ((0x2000000020L & l) != 0L)
-                     { jjAddStates(2307, 2308); }
+                     { jjAddStates(2293, 2294); }
                   break;
-               case 740:
+               case 767:
                   if ((0x200000002000L & l) != 0L)
-                     { jjCheckNAdd(734); }
+                     { jjCheckNAdd(761); }
                   break;
-               case 742:
+               case 769:
                   if ((0x2000000020L & l) != 0L)
-                     { jjAddStates(2309, 2310); }
+                     { jjAddStates(2295, 2296); }
                   break;
-               case 745:
+               case 772:
                   if ((0x2000000020000L & l) != 0L && kind > 63)
                      kind = 63;
                   break;
-               case 747:
+               case 774:
                   if ((0x2000000020L & l) != 0L)
-                     { jjAddStates(2311, 2312); }
+                     { jjAddStates(2297, 2298); }
                   break;
-               case 750:
+               case 777:
                   if ((0x400000004000L & l) != 0L && kind > 63)
                      kind = 63;
                   break;
-               case 751:
+               case 778:
                   if ((0x20000000200L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 750;
+                     jjstateSet[jjnewStateCnt++] = 777;
                   break;
-               case 753:
+               case 780:
                   if ((0x2000000020L & l) != 0L)
-                     { jjAddStates(2313, 2314); }
+                     { jjAddStates(2299, 2300); }
                   break;
-               case 756:
+               case 783:
                   if ((0x10000000100000L & l) != 0L && kind > 63)
                      kind = 63;
                   break;
-               case 757:
+               case 784:
                   if ((0x1000000010000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 756;
+                     jjstateSet[jjnewStateCnt++] = 783;
                   break;
-               case 759:
+               case 786:
                   if ((0x2000000020L & l) != 0L)
-                     { jjAddStates(2315, 2316); }
+                     { jjAddStates(2301, 2302); }
                   break;
-               case 762:
+               case 789:
                   if ((0x800000008L & l) != 0L && kind > 63)
                      kind = 63;
                   break;
-               case 763:
+               case 790:
                   if ((0x1000000010000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 762;
+                     jjstateSet[jjnewStateCnt++] = 789;
                   break;
-               case 765:
+               case 792:
                   if ((0x2000000020L & l) != 0L)
-                     { jjAddStates(2317, 2318); }
+                     { jjAddStates(2303, 2304); }
                   break;
-               case 768:
+               case 795:
                   if ((0x100000001000000L & l) != 0L && kind > 63)
                      kind = 63;
                   break;
-               case 769:
+               case 796:
                   if ((0x1000000010000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 768;
+                     jjstateSet[jjnewStateCnt++] = 795;
                   break;
-               case 771:
+               case 798:
                   if ((0x2000000020L & l) != 0L)
-                     { jjAddStates(2319, 2320); }
+                     { jjAddStates(2305, 2306); }
                   break;
-               case 774:
+               case 801:
                   if ((0x4000000040000L & l) != 0L && kind > 64)
                      kind = 64;
                   break;
-               case 775:
+               case 802:
                   if ((0x4000000040L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 774;
+                     jjstateSet[jjnewStateCnt++] = 801;
                   break;
-               case 777:
+               case 804:
                   if ((0x2000000020L & l) != 0L)
-                     { jjAddStates(2321, 2322); }
+                     { jjAddStates(2307, 2308); }
                   break;
-               case 780:
+               case 807:
                   if ((0x8000000080L & l) != 0L && kind > 65)
                      kind = 65;
                   break;
-               case 781:
+               case 808:
                   if ((0x2000000020L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 780;
+                     jjstateSet[jjnewStateCnt++] = 807;
                   break;
-               case 782:
+               case 809:
                   if ((0x1000000010L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 781;
+                     jjstateSet[jjnewStateCnt++] = 808;
                   break;
-               case 783:
+               case 810:
                   if ((0x1000000010L & l) != 0L && kind > 65)
                      kind = 65;
                   break;
-               case 784:
-               case 787:
+               case 811:
+               case 814:
                   if ((0x200000002L & l) != 0L)
-                     { jjCheckNAdd(783); }
+                     { jjCheckNAdd(810); }
                   break;
-               case 785:
+               case 812:
                   if ((0x4000000040000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 784;
+                     jjstateSet[jjnewStateCnt++] = 811;
                   break;
-               case 786:
+               case 813:
                   if ((0x8000000080L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 785;
+                     jjstateSet[jjnewStateCnt++] = 812;
                   break;
-               case 788:
+               case 815:
                   if ((0x4000000040000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 787;
+                     jjstateSet[jjnewStateCnt++] = 814;
                   break;
-               case 789:
+               case 816:
                   if ((0x400000004000L & l) != 0L && kind > 65)
                      kind = 65;
                   break;
-               case 790:
+               case 817:
                   if ((0x4000000040000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 789;
+                     jjstateSet[jjnewStateCnt++] = 816;
                   break;
-               case 791:
+               case 818:
                   if ((0x20000000200000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 790;
+                     jjstateSet[jjnewStateCnt++] = 817;
                   break;
-               case 792:
+               case 819:
                   if ((0x10000000100000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 791;
+                     jjstateSet[jjnewStateCnt++] = 818;
                   break;
-               case 794:
+               case 821:
                   if ((0x2000000020L & l) != 0L)
-                     { jjAddStates(2323, 2324); }
+                     { jjAddStates(2309, 2310); }
                   break;
-               case 797:
+               case 824:
                   if ((0x400000004L & l) != 0L && kind > 66)
                      kind = 66;
                   break;
-               case 798:
+               case 825:
                   if ((0x1000000010L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 797;
+                     jjstateSet[jjnewStateCnt++] = 824;
                   break;
-               case 800:
+               case 827:
                   if ((0x2000000020L & l) != 0L)
-                     { jjAddStates(2325, 2326); }
+                     { jjAddStates(2311, 2312); }
                   break;
-               case 803:
+               case 830:
                   if ((0x10000000100000L & l) != 0L && kind > 67)
                      kind = 67;
                   break;
-               case 804:
+               case 831:
                   if ((0x8000000080000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 803;
+                     jjstateSet[jjnewStateCnt++] = 830;
                   break;
-               case 806:
+               case 833:
                   if ((0x2000000020L & l) != 0L)
-                     { jjAddStates(2327, 2328); }
+                     { jjAddStates(2313, 2314); }
                   break;
-               case 809:
-               case 811:
+               case 836:
+               case 838:
                   if ((0x8000000080000L & l) != 0L && kind > 68)
                      kind = 68;
                   break;
-               case 810:
+               case 837:
                   if ((0x200000002000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 809;
+                     jjstateSet[jjnewStateCnt++] = 836;
                   break;
-               case 813:
+               case 840:
                   if ((0x2000000020L & l) != 0L)
-                     { jjAddStates(2329, 2330); }
+                     { jjAddStates(2315, 2316); }
                   break;
-               case 816:
+               case 843:
                   if ((0x400000004000000L & l) != 0L && kind > 69)
                      kind = 69;
                   break;
-               case 817:
-               case 818:
+               case 844:
+               case 845:
                   if ((0x10000000100L & l) != 0L)
-                     { jjCheckNAdd(816); }
+                     { jjCheckNAdd(843); }
                   break;
-               case 819:
+               case 846:
                   if ((0x80000000800L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 818;
+                     jjstateSet[jjnewStateCnt++] = 845;
                   break;
-               case 821:
+               case 848:
                   if ((0x2000000020L & l) != 0L)
-                     { jjAddStates(2331, 2332); }
+                     { jjAddStates(2317, 2318); }
                   break;
-               case 824:
-               case 831:
+               case 851:
+               case 858:
                   if ((0x100000001000000L & l) != 0L && kind > 70)
                      kind = 70;
                   break;
-               case 825:
+               case 852:
                   if ((0x1000000010L & l) != 0L)
-                     { jjAddStates(2333, 2335); }
+                     { jjAddStates(2319, 2321); }
                   break;
-               case 826:
+               case 853:
                   if ((0x20000000200L & l) != 0L && kind > 70)
                      kind = 70;
                   break;
-               case 827:
+               case 854:
                   if ((0x1000000010000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 826;
+                     jjstateSet[jjnewStateCnt++] = 853;
                   break;
-               case 828:
+               case 855:
                   if ((0x200000002000L & l) != 0L && kind > 70)
                      kind = 70;
                   break;
-               case 829:
+               case 856:
                   if ((0x800000008L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 828;
+                     jjstateSet[jjnewStateCnt++] = 855;
                   break;
-               case 830:
+               case 857:
                   if ((0x1000000010000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 829;
+                     jjstateSet[jjnewStateCnt++] = 856;
                   break;
-               case 832:
+               case 859:
                   if ((0x1000000010000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 831;
+                     jjstateSet[jjnewStateCnt++] = 858;
                   break;
-               case 833:
+               case 860:
                   if ((0x1000000010000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 832;
+                     jjstateSet[jjnewStateCnt++] = 859;
                   break;
-               case 835:
+               case 862:
                   if ((0x2000000020L & l) != 0L)
-                     { jjAddStates(2336, 2337); }
+                     { jjAddStates(2322, 2323); }
                   break;
-               case 838:
+               case 865:
                   if ((0x400000004000L & l) != 0L && kind > 71)
                      kind = 71;
                   break;
-               case 840:
+               case 867:
                   if ((0x2000000020L & l) != 0L)
-                     { jjAddStates(2338, 2339); }
+                     { jjAddStates(2324, 2325); }
                   break;
-               case 843:
-               case 844:
+               case 870:
+               case 871:
                   if ((0x7fffffe87fffffeL & l) != 0L)
-                     { jjCheckNAddStates(1823, 1825); }
+                     { jjCheckNAddStates(1862, 1864); }
                   break;
-               case 846:
+               case 873:
                   if (curChar == 92)
-                     jjstateSet[jjnewStateCnt++] = 845;
+                     jjstateSet[jjnewStateCnt++] = 872;
                   break;
-               case 847:
+               case 874:
                   if (curChar == 92)
-                     { jjCheckNAddTwoStates(848, 849); }
+                     { jjCheckNAddTwoStates(875, 876); }
                   break;
-               case 848:
+               case 875:
                   if ((0xffffff81ffffff81L & l) != 0L)
-                     { jjCheckNAddStates(1823, 1825); }
+                     { jjCheckNAddStates(1862, 1864); }
                   break;
-               case 849:
+               case 876:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(1826, 1831); }
+                     { jjCheckNAddStates(1865, 1870); }
                   break;
-               case 853:
+               case 880:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(1832, 1840); }
+                     { jjCheckNAddStates(1871, 1879); }
                   break;
-               case 854:
+               case 881:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(1841, 1845); }
+                     { jjCheckNAddStates(1880, 1884); }
                   break;
-               case 855:
+               case 882:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(1846, 1851); }
+                     { jjCheckNAddStates(1885, 1890); }
                   break;
-               case 856:
+               case 883:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(1852, 1858); }
+                     { jjCheckNAddStates(1891, 1897); }
                   break;
-               case 857:
+               case 884:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(1859, 1866); }
+                     { jjCheckNAddStates(1898, 1905); }
                   break;
-               case 858:
+               case 885:
                   if (curChar == 92)
-                     { jjCheckNAddTwoStates(848, 859); }
+                     { jjCheckNAddTwoStates(875, 886); }
                   break;
-               case 859:
+               case 886:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(1867, 1872); }
+                     { jjCheckNAddStates(1906, 1911); }
                   break;
-               case 861:
+               case 888:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(1873, 1881); }
+                     { jjCheckNAddStates(1912, 1920); }
                   break;
-               case 862:
+               case 889:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(1882, 1886); }
+                     { jjCheckNAddStates(1921, 1925); }
                   break;
-               case 863:
+               case 890:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(1887, 1892); }
+                     { jjCheckNAddStates(1926, 1931); }
                   break;
-               case 864:
+               case 891:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(1893, 1899); }
+                     { jjCheckNAddStates(1932, 1938); }
                   break;
-               case 865:
+               case 892:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(1900, 1907); }
+                     { jjCheckNAddStates(1939, 1946); }
                   break;
-               case 867:
+               case 894:
                   if ((0x2000000020L & l) != 0L)
-                     { jjAddStates(2340, 2341); }
+                     { jjAddStates(2326, 2327); }
                   break;
-               case 870:
-               case 871:
+               case 897:
+               case 898:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
                   if (kind > 73)
                      kind = 73;
-                  { jjCheckNAddTwoStates(871, 872); }
+                  { jjCheckNAddTwoStates(898, 899); }
                   break;
-               case 872:
+               case 899:
                   if (curChar == 92)
-                     { jjCheckNAddTwoStates(873, 874); }
+                     { jjCheckNAddTwoStates(900, 901); }
                   break;
-               case 873:
+               case 900:
                   if ((0xffffff81ffffff81L & l) == 0L)
                      break;
                   if (kind > 73)
                      kind = 73;
-                  { jjCheckNAddTwoStates(871, 872); }
+                  { jjCheckNAddTwoStates(898, 899); }
                   break;
-               case 874:
+               case 901:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 73)
                      kind = 73;
-                  { jjCheckNAddStates(1915, 1919); }
+                  { jjCheckNAddStates(1954, 1958); }
                   break;
-               case 878:
+               case 905:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 73)
                      kind = 73;
-                  { jjCheckNAddStates(1920, 1927); }
+                  { jjCheckNAddStates(1959, 1966); }
                   break;
-               case 879:
+               case 906:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 73)
                      kind = 73;
-                  { jjCheckNAddStates(1928, 1931); }
+                  { jjCheckNAddStates(1967, 1970); }
                   break;
-               case 880:
+               case 907:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 73)
                      kind = 73;
-                  { jjCheckNAddStates(1932, 1936); }
+                  { jjCheckNAddStates(1971, 1975); }
                   break;
-               case 881:
+               case 908:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 73)
                      kind = 73;
-                  { jjCheckNAddStates(1937, 1942); }
+                  { jjCheckNAddStates(1976, 1981); }
                   break;
-               case 882:
+               case 909:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 73)
                      kind = 73;
-                  { jjCheckNAddStates(1943, 1949); }
+                  { jjCheckNAddStates(1982, 1988); }
                   break;
-               case 883:
+               case 910:
                   if (curChar == 92)
-                     { jjCheckNAddTwoStates(873, 884); }
+                     { jjCheckNAddTwoStates(900, 911); }
                   break;
-               case 884:
+               case 911:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 73)
                      kind = 73;
-                  { jjCheckNAddStates(1950, 1954); }
+                  { jjCheckNAddStates(1989, 1993); }
                   break;
-               case 886:
+               case 913:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 73)
                      kind = 73;
-                  { jjCheckNAddStates(1955, 1962); }
+                  { jjCheckNAddStates(1994, 2001); }
                   break;
-               case 887:
+               case 914:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 73)
                      kind = 73;
-                  { jjCheckNAddStates(1963, 1966); }
+                  { jjCheckNAddStates(2002, 2005); }
                   break;
-               case 888:
+               case 915:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 73)
                      kind = 73;
-                  { jjCheckNAddStates(1967, 1971); }
+                  { jjCheckNAddStates(2006, 2010); }
                   break;
-               case 889:
+               case 916:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 73)
                      kind = 73;
-                  { jjCheckNAddStates(1972, 1977); }
+                  { jjCheckNAddStates(2011, 2016); }
                   break;
-               case 890:
+               case 917:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 73)
                      kind = 73;
-                  { jjCheckNAddStates(1978, 1984); }
+                  { jjCheckNAddStates(2017, 2023); }
                   break;
-               case 892:
+               case 919:
                   if ((0x2000000020L & l) != 0L)
-                     { jjAddStates(2342, 2343); }
+                     { jjAddStates(2328, 2329); }
                   break;
-               case 897:
+               case 924:
                   if ((0x2000000020L & l) != 0L)
-                     { jjAddStates(2344, 2345); }
+                     { jjAddStates(2330, 2331); }
                   break;
-               case 901:
-               case 902:
-                  if ((0x7fffffe87fffffeL & l) == 0L)
-                     break;
-                  if (kind > 120)
-                     kind = 120;
-                  { jjCheckNAddTwoStates(902, 903); }
+               case 930:
+                  { jjAddStates(2332, 2333); }
                   break;
-               case 903:
-                  if (curChar == 92)
-                     { jjCheckNAddTwoStates(904, 905); }
+               case 932:
+               case 933:
+                  { jjCheckNAddTwoStates(933, 934); }
                   break;
-               case 904:
-                  if ((0xffffff81ffffff81L & l) == 0L)
-                     break;
-                  if (kind > 120)
-                     kind = 120;
-                  { jjCheckNAddTwoStates(902, 903); }
+               case 937:
+                  if ((0x10000000100000L & l) != 0L && kind > 76)
+                     kind = 76;
                   break;
-               case 905:
-                  if ((0x7e0000007eL & l) == 0L)
-                     break;
-                  if (kind > 120)
-                     kind = 120;
-                  { jjCheckNAddStates(1988, 1992); }
+               case 938:
+                  if ((0x400000004000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 937;
                   break;
-               case 909:
-                  if ((0x7e0000007eL & l) == 0L)
-                     break;
-                  if (kind > 120)
-                     kind = 120;
-                  { jjCheckNAddStates(1993, 2000); }
+               case 939:
+                  if ((0x200000002L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 938;
                   break;
-               case 910:
-                  if ((0x7e0000007eL & l) == 0L)
-                     break;
-                  if (kind > 120)
-                     kind = 120;
-                  { jjCheckNAddStates(2001, 2004); }
+               case 940:
+                  if ((0x10000000100000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 939;
                   break;
-               case 911:
-                  if ((0x7e0000007eL & l) == 0L)
-                     break;
-                  if (kind > 120)
-                     kind = 120;
-                  { jjCheckNAddStates(2005, 2009); }
+               case 941:
+                  if ((0x4000000040000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 940;
                   break;
-               case 912:
-                  if ((0x7e0000007eL & l) == 0L)
-                     break;
-                  if (kind > 120)
-                     kind = 120;
-                  { jjCheckNAddStates(2010, 2015); }
+               case 942:
+                  if ((0x800000008000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 941;
                   break;
-               case 913:
-                  if ((0x7e0000007eL & l) == 0L)
-                     break;
-                  if (kind > 120)
-                     kind = 120;
-                  { jjCheckNAddStates(2016, 2022); }
+               case 943:
+                  if ((0x1000000010000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 942;
                   break;
-               case 914:
-                  if (curChar == 92)
-                     { jjCheckNAddTwoStates(904, 915); }
+               case 944:
+                  if ((0x200000002000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 943;
                   break;
-               case 915:
-                  if ((0x7e0000007eL & l) == 0L)
-                     break;
-                  if (kind > 120)
-                     kind = 120;
-                  { jjCheckNAddStates(2023, 2027); }
+               case 945:
+                  if ((0x20000000200L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 944;
                   break;
-               case 917:
-                  if ((0x7e0000007eL & l) == 0L)
-                     break;
-                  if (kind > 120)
-                     kind = 120;
-                  { jjCheckNAddStates(2028, 2035); }
+               case 948:
+                  { jjAddStates(2334, 2335); }
                   break;
-               case 918:
-                  if ((0x7e0000007eL & l) == 0L)
-                     break;
-                  if (kind > 120)
-                     kind = 120;
-                  { jjCheckNAddStates(2036, 2039); }
+               case 950:
+               case 951:
+                  { jjCheckNAddTwoStates(951, 952); }
                   break;
-               case 919:
-                  if ((0x7e0000007eL & l) == 0L)
+               case 955:
+                  if ((0x2000000020L & l) == 0L)
                      break;
-                  if (kind > 120)
-                     kind = 120;
-                  { jjCheckNAddStates(2040, 2044); }
+                  if (kind > 77)
+                     kind = 77;
+                  jjstateSet[jjnewStateCnt++] = 956;
                   break;
-               case 920:
-                  if ((0x7e0000007eL & l) == 0L)
-                     break;
-                  if (kind > 120)
-                     kind = 120;
-                  { jjCheckNAddStates(2045, 2050); }
+               case 957:
+                  if ((0x20000000200L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 955;
                   break;
-               case 921:
-                  if ((0x7e0000007eL & l) == 0L)
-                     break;
-                  if (kind > 120)
-                     kind = 120;
-                  { jjCheckNAddStates(2051, 2057); }
+               case 958:
+                  if ((0x800000008L & l) != 0L)
+                     { jjAddStates(2175, 2176); }
                   break;
-               case 925:
-                  { jjAddStates(2346, 2347); }
+               case 960:
+                  if ((0x100000001000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 959;
                   break;
-               case 927:
-               case 928:
-                  { jjCheckNAddTwoStates(928, 929); }
+               case 961:
+                  if ((0x200000002L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 960;
                   break;
-               case 932:
-                  if ((0x10000000100000L & l) != 0L && kind > 76)
-                     kind = 76;
+               case 962:
+               case 975:
+               case 981:
+                  if ((0x8000000080000L & l) != 0L)
+                     { jjCheckNAdd(45); }
                   break;
-               case 933:
+               case 963:
+                  if ((0x800000008000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 962;
+                  break;
+               case 964:
+                  if ((0x200000002000L & l) != 0L)
+                     { jjAddStates(2172, 2174); }
+                  break;
+               case 965:
                   if ((0x400000004000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 932;
+                     { jjCheckNAdd(39); }
                   break;
-               case 934:
+               case 966:
+                  if ((0x20000000200L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 965;
+                  break;
+               case 967:
+                  if ((0x100000001000000L & l) != 0L)
+                     { jjCheckNAdd(39); }
+                  break;
+               case 968:
                   if ((0x200000002L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 933;
+                     jjstateSet[jjnewStateCnt++] = 967;
                   break;
-               case 935:
-                  if ((0x10000000100000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 934;
+               case 969:
+                  if ((0x1000000010L & l) != 0L)
+                     { jjCheckNAdd(52); }
                   break;
-               case 936:
-                  if ((0x4000000040000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 935;
+               case 970:
+                  if ((0x800000008000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 969;
                   break;
-               case 937:
+               case 971:
+                  if ((0x200000002L & l) != 0L)
+                     { jjAddStates(2167, 2171); }
+                  break;
+               case 973:
+                  if ((0x20000000200L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 972;
+                  break;
+               case 974:
+                  if ((0x8000000080000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 973;
+                  break;
+               case 976:
                   if ((0x800000008000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 936;
+                     jjstateSet[jjnewStateCnt++] = 975;
                   break;
-               case 938:
-                  if ((0x1000000010000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 937;
+               case 977:
+                  if ((0x800000008L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 976;
                   break;
-               case 939:
-                  if ((0x200000002000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 938;
+               case 979:
+                  if ((0x200000002L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 978;
                   break;
-               case 940:
-                  if ((0x20000000200L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 939;
+               case 980:
+                  if ((0x10000000100000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 979;
                   break;
-               case 943:
-                  { jjAddStates(2348, 2349); }
+               case 982:
+                  if ((0x400000004L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 981;
                   break;
-               case 945:
-               case 946:
-                  { jjCheckNAddTwoStates(946, 947); }
+               case 984:
+                  if ((0x400000004000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 983;
                   break;
-               case 950:
-                  if ((0x2000000020L & l) == 0L)
-                     break;
-                  if (kind > 77)
-                     kind = 77;
-                  jjstateSet[jjnewStateCnt++] = 951;
+               case 985:
+                  if ((0x200000002L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 984;
                   break;
-               case 952:
-                  if ((0x20000000200L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 950;
+               case 986:
+                  if ((0x10000000100000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 985;
                   break;
-               case 953:
+               case 987:
                   if (curChar == 92)
-                     { jjCheckNAddStates(2185, 2188); }
+                     { jjCheckNAddStates(2160, 2163); }
                   break;
                default : break;
             }
@@ -7650,11 +7619,11 @@ else if ((0x1000000010000L & l) != 0L)
                      break;
                   if (kind > 41)
                      kind = 41;
-                  { jjCheckNAddStates(2180, 2184); }
+                  { jjCheckNAddStates(2155, 2159); }
                   break;
                case 1:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjAddStates(2195, 2196); }
+                     { jjAddStates(2185, 2186); }
                   break;
                case 3:
                case 4:
@@ -7662,319 +7631,310 @@ else if ((0x1000000010000L & l) != 0L)
                      { jjCheckNAddTwoStates(4, 5); }
                   break;
                case 18:
-                  if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjAddStates(271, 272); }
-                  break;
-               case 55:
-               case 56:
-               case 58:
+               case 19:
+               case 21:
                   if (!jjCanMove_0(hiByte, i1, i2, l1, l2))
                      break;
                   if (kind > 109)
                      kind = 109;
-                  { jjCheckNAddTwoStates(56, 57); }
+                  { jjCheckNAddTwoStates(19, 20); }
                   break;
-               case 85:
+               case 63:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjAddStates(2201, 2202); }
+                     { jjAddStates(2191, 2192); }
                   break;
-               case 87:
-               case 88:
+               case 65:
+               case 66:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddTwoStates(88, 89); }
+                     { jjCheckNAddTwoStates(66, 67); }
                   break;
-               case 93:
-               case 94:
-               case 192:
+               case 71:
+               case 72:
+               case 170:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddStates(356, 361); }
+                     { jjCheckNAddStates(351, 356); }
                   break;
-               case 97:
+               case 75:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjAddStates(2203, 2204); }
+                     { jjAddStates(2193, 2194); }
                   break;
-               case 99:
+               case 77:
+               case 78:
+                  if (jjCanMove_0(hiByte, i1, i2, l1, l2))
+                     { jjCheckNAddTwoStates(78, 79); }
+                  break;
+               case 83:
+               case 84:
                case 100:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddTwoStates(100, 101); }
+                     { jjCheckNAddStates(369, 371); }
                   break;
-               case 105:
-               case 106:
-               case 122:
+               case 87:
+               case 88:
+               case 119:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddStates(374, 376); }
+                     { jjCheckNAddStates(377, 382); }
                   break;
-               case 109:
-               case 110:
-               case 141:
+               case 91:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddStates(382, 387); }
+                     { jjAddStates(2195, 2196); }
                   break;
-               case 113:
+               case 93:
+               case 94:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjAddStates(2205, 2206); }
+                     { jjCheckNAddTwoStates(94, 95); }
                   break;
-               case 115:
-               case 116:
+               case 138:
+               case 144:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddTwoStates(116, 117); }
+                     { jjCheckNAddStates(592, 594); }
                   break;
+               case 154:
                case 160:
-               case 166:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddStates(597, 599); }
+                     { jjCheckNAddStates(641, 643); }
                   break;
-               case 176:
-               case 182:
+               case 198:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddStates(646, 648); }
+                     { jjAddStates(2213, 2214); }
                   break;
-               case 220:
+               case 200:
+               case 201:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjAddStates(2223, 2224); }
+                     { jjCheckNAddTwoStates(201, 202); }
                   break;
-               case 222:
-               case 223:
+               case 206:
+               case 207:
+               case 219:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddTwoStates(223, 224); }
+                     { jjCheckNAddStates(815, 818); }
                   break;
-               case 228:
-               case 229:
-               case 241:
+               case 210:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddStates(820, 823); }
+                     { jjAddStates(2215, 2216); }
                   break;
-               case 232:
+               case 212:
+               case 213:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjAddStates(2225, 2226); }
+                     { jjCheckNAddTwoStates(213, 214); }
                   break;
-               case 234:
-               case 235:
+               case 270:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddTwoStates(235, 236); }
+                     { jjAddStates(2217, 2218); }
                   break;
-               case 282:
+               case 272:
+               case 273:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjAddStates(2227, 2228); }
+                     { jjCheckNAddTwoStates(273, 274); }
                   break;
-               case 284:
-               case 285:
+               case 279:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddTwoStates(285, 286); }
+                     { jjAddStates(2219, 2220); }
                   break;
-               case 291:
+               case 281:
+               case 282:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjAddStates(2229, 2230); }
+                     { jjCheckNAddTwoStates(282, 283); }
+                  break;
+               case 290:
+                  if (jjCanMove_0(hiByte, i1, i2, l1, l2))
+                     { jjAddStates(2221, 2222); }
                   break;
+               case 292:
                case 293:
-               case 294:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddTwoStates(294, 295); }
+                     { jjCheckNAddTwoStates(293, 294); }
                   break;
+               case 299:
+                  if (jjCanMove_0(hiByte, i1, i2, l1, l2))
+                     { jjAddStates(2223, 2224); }
+                  break;
+               case 301:
                case 302:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjAddStates(2231, 2232); }
+                     { jjCheckNAddTwoStates(302, 303); }
                   break;
-               case 304:
-               case 305:
+               case 308:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddTwoStates(305, 306); }
+                     { jjAddStates(2225, 2226); }
                   break;
+               case 310:
                case 311:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjAddStates(2233, 2234); }
+                     { jjCheckNAddTwoStates(311, 312); }
                   break;
-               case 313:
-               case 314:
+               case 317:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddTwoStates(314, 315); }
+                     { jjAddStates(2227, 2228); }
                   break;
+               case 319:
                case 320:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjAddStates(2235, 2236); }
+                     { jjCheckNAddTwoStates(320, 321); }
                   break;
-               case 322:
-               case 323:
+               case 326:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddTwoStates(323, 324); }
+                     { jjAddStates(2229, 2230); }
                   break;
+               case 328:
                case 329:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjAddStates(2237, 2238); }
+                     { jjCheckNAddTwoStates(329, 330); }
                   break;
-               case 331:
-               case 332:
+               case 335:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddTwoStates(332, 333); }
+                     { jjAddStates(2231, 2232); }
                   break;
+               case 337:
                case 338:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjAddStates(2239, 2240); }
+                     { jjCheckNAddTwoStates(338, 339); }
                   break;
-               case 340:
-               case 341:
+               case 345:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddTwoStates(341, 342); }
+                     { jjAddStates(2233, 2234); }
                   break;
                case 347:
+               case 348:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjAddStates(2241, 2242); }
-                  break;
-               case 349:
-               case 350:
-                  if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddTwoStates(350, 351); }
-                  break;
-               case 357:
-                  if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjAddStates(2243, 2244); }
-                  break;
-               case 359:
-               case 360:
-                  if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddTwoStates(360, 361); }
+                     { jjCheckNAddTwoStates(348, 349); }
                   break;
-               case 367:
-               case 373:
+               case 355:
+               case 361:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddStates(999, 1001); }
+                     { jjCheckNAddStates(994, 996); }
                   break;
-               case 382:
-               case 387:
+               case 370:
+               case 375:
                   if (!jjCanMove_0(hiByte, i1, i2, l1, l2))
                      break;
                   if (kind > 40)
                      kind = 40;
-                  { jjCheckNAddTwoStates(382, 383); }
+                  { jjCheckNAddTwoStates(370, 371); }
                   break;
-               case 397:
-               case 403:
+               case 385:
+               case 391:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddStates(1078, 1080); }
+                     { jjCheckNAddStates(1073, 1075); }
                   break;
-               case 412:
-               case 417:
+               case 400:
+               case 405:
                   if (!jjCanMove_0(hiByte, i1, i2, l1, l2))
                      break;
                   if (kind > 40)
                      kind = 40;
-                  { jjCheckNAddTwoStates(412, 413); }
+                  { jjCheckNAddTwoStates(400, 401); }
                   break;
-               case 427:
-               case 428:
-               case 430:
+               case 415:
+               case 416:
+               case 418:
                   if (!jjCanMove_0(hiByte, i1, i2, l1, l2))
                      break;
                   if (kind > 41)
                      kind = 41;
-                  { jjCheckNAddTwoStates(428, 429); }
+                  { jjCheckNAddTwoStates(416, 417); }
                   break;
-               case 441:
-               case 442:
-               case 444:
+               case 429:
+               case 430:
+               case 432:
                   if (!jjCanMove_0(hiByte, i1, i2, l1, l2))
                      break;
                   if (kind > 45)
                      kind = 45;
-                  { jjCheckNAddTwoStates(442, 443); }
+                  { jjCheckNAddTwoStates(430, 431); }
                   break;
-               case 462:
-               case 463:
-               case 466:
+               case 450:
+               case 451:
+               case 454:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddStates(1264, 1266); }
+                     { jjCheckNAddStates(1259, 1261); }
                   break;
-               case 495:
-               case 496:
-               case 498:
+               case 483:
+               case 484:
+               case 486:
                   if (!jjCanMove_0(hiByte, i1, i2, l1, l2))
                      break;
                   if (kind > 42)
                      kind = 42;
-                  { jjCheckNAddTwoStates(496, 497); }
+                  { jjCheckNAddTwoStates(484, 485); }
                   break;
-               case 516:
-               case 518:
+               case 504:
+               case 506:
                   if (!jjCanMove_0(hiByte, i1, i2, l1, l2))
                      break;
                   if (kind > 43)
                      kind = 43;
-                  { jjCheckNAddTwoStates(516, 517); }
+                  { jjCheckNAddTwoStates(504, 505); }
                   break;
-               case 531:
-               case 547:
+               case 519:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddStates(1495, 1497); }
+                     { jjAddStates(1484, 1485); }
                   break;
-               case 535:
+               case 558:
+               case 574:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjAddStates(2263, 2264); }
+                     { jjCheckNAddStates(1492, 1494); }
                   break;
-               case 537:
-               case 538:
+               case 562:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddTwoStates(538, 539); }
+                     { jjAddStates(2253, 2254); }
                   break;
-               case 557:
-               case 563:
+               case 564:
+               case 565:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddStates(1548, 1550); }
+                     { jjCheckNAddTwoStates(565, 566); }
                   break;
-               case 572:
-               case 574:
+               case 584:
+               case 590:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddStates(1592, 1595); }
+                     { jjCheckNAddStates(1545, 1547); }
                   break;
-               case 586:
+               case 599:
+               case 601:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjAddStates(2275, 2276); }
+                     { jjCheckNAddStates(1589, 1592); }
                   break;
-               case 588:
-               case 589:
+               case 613:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddTwoStates(589, 590); }
+                     { jjAddStates(2265, 2266); }
                   break;
-               case 843:
-               case 844:
-               case 848:
+               case 615:
+               case 616:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddStates(1823, 1825); }
+                     { jjCheckNAddTwoStates(616, 617); }
                   break;
                case 870:
                case 871:
-               case 873:
+               case 875:
+                  if (jjCanMove_0(hiByte, i1, i2, l1, l2))
+                     { jjCheckNAddStates(1862, 1864); }
+                  break;
+               case 897:
+               case 898:
+               case 900:
                   if (!jjCanMove_0(hiByte, i1, i2, l1, l2))
                      break;
                   if (kind > 73)
                      kind = 73;
-                  { jjCheckNAddTwoStates(871, 872); }
+                  { jjCheckNAddTwoStates(898, 899); }
                   break;
-               case 901:
-               case 902:
-               case 904:
-                  if (!jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     break;
-                  if (kind > 120)
-                     kind = 120;
-                  { jjCheckNAddTwoStates(902, 903); }
-                  break;
-               case 925:
+               case 930:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjAddStates(2346, 2347); }
+                     { jjAddStates(2332, 2333); }
                   break;
-               case 927:
-               case 928:
+               case 932:
+               case 933:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddTwoStates(928, 929); }
+                     { jjCheckNAddTwoStates(933, 934); }
                   break;
-               case 943:
+               case 948:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjAddStates(2348, 2349); }
+                     { jjAddStates(2334, 2335); }
                   break;
-               case 945:
-               case 946:
+               case 950:
+               case 951:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddTwoStates(946, 947); }
+                     { jjCheckNAddTwoStates(951, 952); }
                   break;
                default : if (i1 == 0 || l1 == 0 || i2 == 0 || l2 == 0) break; else break;
             }
@@ -7987,7 +7947,7 @@ else if ((0x1000000010000L & l) != 0L)
          kind = 0x7fffffff;
       }
       ++curPos;
-      if ((i = jjnewStateCnt) == (startsAt = 1054 - (jjnewStateCnt = startsAt)))
+      if ((i = jjnewStateCnt) == (startsAt = 1082 - (jjnewStateCnt = startsAt)))
          break;
       try { curChar = input_stream.readChar(); }
       catch(java.io.IOException e) { break; }
@@ -8013,153 +7973,152 @@ else if (jjmatchedPos == strPos && jjmatchedKind > strKind)
    return toRet;
 }
 static final int[] jjnextStates = {
-   955, 956, 957, 643, 647, 958, 959, 960, 649, 653, 961, 962, 963, 655, 660, 964, 
-   965, 966, 662, 666, 967, 968, 969, 668, 672, 970, 971, 972, 674, 677, 973, 974, 
-   975, 679, 683, 976, 977, 978, 685, 689, 979, 980, 981, 691, 695, 982, 983, 984, 
-   697, 701, 985, 986, 987, 703, 707, 988, 989, 990, 709, 713, 991, 992, 993, 715, 
-   721, 994, 995, 996, 723, 729, 997, 998, 999, 731, 735, 1000, 1001, 1002, 737, 740, 
-   1003, 1004, 1005, 742, 745, 1006, 1007, 1008, 747, 751, 1009, 1010, 1011, 753, 757, 1012, 
-   1013, 1014, 759, 763, 1015, 1016, 1017, 765, 769, 1018, 1019, 1020, 771, 775, 1021, 1022, 
-   1023, 777, 782, 786, 788, 792, 1024, 1025, 1026, 794, 798, 1027, 1028, 1029, 800, 804, 
-   1030, 1031, 1032, 806, 810, 811, 1033, 1034, 1035, 813, 817, 819, 1036, 1037, 1038, 821, 
-   824, 1039, 1040, 1041, 835, 838, 1042, 1043, 1044, 840, 843, 1045, 1046, 1047, 867, 870, 
-   1048, 1049, 1050, 892, 895, 1051, 1052, 1053, 897, 883, 858, 825, 288, 289, 297, 298, 
-   299, 308, 309, 8, 317, 318, 9, 326, 327, 10, 335, 336, 12, 344, 345, 13, 
-   353, 354, 355, 363, 364, 15, 923, 940, 941, 952, 642, 648, 654, 661, 667, 673, 
-   678, 684, 690, 696, 702, 708, 714, 722, 730, 736, 741, 746, 752, 758, 764, 770, 
-   776, 793, 799, 805, 812, 820, 834, 839, 866, 891, 896, 900, 901, 914, 494, 495, 
-   516, 517, 508, 427, 440, 462, 476, 484, 397, 398, 412, 413, 399, 367, 368, 382, 
-   383, 369, 268, 279, 216, 83, 92, 93, 202, 2, 3, 6, 3, 5, 6, 18, 
-   19, 55, 68, 56, 61, 62, 57, 63, 56, 64, 61, 62, 57, 65, 66, 67, 
-   56, 61, 62, 57, 56, 64, 61, 62, 57, 56, 64, 61, 62, 57, 65, 56, 
-   64, 61, 62, 57, 65, 66, 70, 62, 56, 57, 71, 72, 70, 62, 56, 57, 
-   73, 74, 75, 70, 62, 56, 57, 72, 70, 62, 56, 57, 72, 70, 62, 56, 
-   57, 73, 72, 70, 62, 56, 57, 73, 74, 91, 92, 93, 202, 83, 86, 87, 
-   90, 87, 89, 90, 94, 95, 104, 105, 120, 191, 103, 104, 105, 120, 121, 95, 
-   98, 99, 102, 99, 101, 102, 106, 107, 123, 108, 109, 159, 175, 151, 104, 105, 
-   110, 111, 120, 140, 104, 105, 119, 120, 121, 111, 114, 115, 118, 115, 117, 118, 
-   106, 126, 127, 107, 123, 128, 106, 129, 126, 127, 107, 123, 130, 131, 132, 106, 
-   126, 127, 107, 123, 106, 129, 126, 127, 107, 123, 106, 129, 126, 127, 107, 123, 
-   130, 106, 129, 126, 127, 107, 123, 130, 131, 134, 127, 106, 107, 123, 135, 136, 
-   134, 127, 106, 107, 123, 137, 138, 139, 134, 127, 106, 107, 123, 136, 134, 127, 
-   106, 107, 123, 136, 134, 127, 106, 107, 123, 137, 136, 134, 127, 106, 107, 123, 
-   137, 138, 104, 105, 110, 144, 120, 140, 145, 146, 104, 105, 110, 111, 119, 120, 
-   121, 111, 140, 104, 105, 110, 147, 144, 120, 140, 145, 148, 149, 150, 104, 105, 
-   110, 144, 120, 140, 145, 104, 105, 110, 147, 144, 120, 140, 145, 104, 105, 110, 
-   147, 144, 120, 140, 145, 148, 104, 105, 110, 147, 144, 120, 140, 145, 148, 149, 
-   104, 105, 153, 110, 120, 140, 145, 154, 104, 105, 155, 153, 110, 120, 140, 145, 
-   156, 157, 158, 104, 105, 153, 110, 120, 140, 145, 104, 105, 155, 153, 110, 120, 
-   140, 145, 104, 105, 155, 153, 110, 120, 140, 145, 156, 104, 105, 155, 153, 110, 
-   120, 140, 145, 156, 157, 160, 161, 162, 104, 105, 111, 120, 121, 160, 168, 169, 
-   161, 162, 170, 160, 171, 168, 169, 161, 162, 172, 173, 174, 160, 168, 169, 161, 
-   162, 160, 171, 168, 169, 161, 162, 160, 171, 168, 169, 161, 162, 172, 160, 171, 
-   168, 169, 161, 162, 172, 173, 176, 177, 178, 176, 184, 185, 177, 178, 186, 176, 
-   187, 184, 185, 177, 178, 188, 189, 190, 176, 184, 185, 177, 178, 176, 187, 184, 
-   185, 177, 178, 176, 187, 184, 185, 177, 178, 188, 176, 187, 184, 185, 177, 178, 
-   188, 189, 94, 195, 104, 105, 120, 191, 196, 197, 94, 95, 103, 104, 105, 120, 
-   121, 95, 191, 94, 198, 195, 104, 105, 120, 191, 196, 199, 200, 201, 94, 195, 
-   104, 105, 120, 191, 196, 94, 198, 195, 104, 105, 120, 191, 196, 94, 198, 195, 
-   104, 105, 120, 191, 196, 199, 94, 198, 195, 104, 105, 120, 191, 196, 199, 200, 
-   204, 94, 104, 105, 120, 191, 196, 205, 206, 204, 94, 104, 105, 120, 191, 196, 
-   207, 208, 209, 204, 94, 104, 105, 120, 191, 196, 206, 204, 94, 104, 105, 120, 
-   191, 196, 206, 204, 94, 104, 105, 120, 191, 196, 207, 206, 204, 94, 104, 105, 
-   120, 191, 196, 207, 208, 218, 227, 228, 251, 226, 227, 228, 251, 218, 221, 222, 
-   225, 222, 224, 225, 229, 230, 239, 240, 238, 239, 230, 233, 234, 237, 234, 236, 
-   237, 229, 244, 239, 240, 245, 246, 229, 230, 238, 239, 230, 240, 229, 247, 244, 
-   239, 240, 245, 248, 249, 250, 229, 244, 239, 240, 245, 229, 247, 244, 239, 240, 
-   245, 229, 247, 244, 239, 240, 245, 248, 229, 247, 244, 239, 240, 245, 248, 249, 
-   253, 229, 239, 240, 245, 254, 255, 253, 229, 239, 240, 245, 256, 257, 258, 253, 
-   229, 239, 240, 245, 255, 253, 229, 239, 240, 245, 255, 253, 229, 239, 240, 245, 
-   256, 255, 253, 229, 239, 240, 245, 256, 257, 283, 284, 287, 284, 286, 287, 292, 
-   293, 296, 293, 295, 296, 297, 298, 299, 303, 304, 307, 304, 306, 307, 308, 309, 
-   8, 312, 313, 316, 313, 315, 316, 317, 318, 9, 321, 322, 325, 322, 324, 325, 
-   326, 327, 10, 330, 331, 334, 331, 333, 334, 335, 336, 12, 339, 340, 343, 340, 
-   342, 343, 344, 345, 13, 348, 349, 352, 349, 351, 352, 353, 354, 355, 358, 359, 
-   362, 359, 361, 362, 363, 364, 15, 367, 368, 369, 367, 375, 376, 368, 369, 377, 
-   367, 378, 375, 376, 368, 369, 379, 380, 381, 367, 375, 376, 368, 369, 367, 378, 
-   375, 376, 368, 369, 367, 378, 375, 376, 368, 369, 379, 367, 378, 375, 376, 368, 
-   369, 379, 380, 382, 389, 390, 383, 391, 382, 392, 389, 390, 383, 393, 394, 395, 
-   382, 389, 390, 383, 382, 392, 389, 390, 383, 382, 392, 389, 390, 383, 393, 382, 
-   392, 389, 390, 383, 393, 394, 397, 398, 399, 397, 405, 406, 398, 399, 407, 397, 
-   408, 405, 406, 398, 399, 409, 410, 411, 397, 405, 406, 398, 399, 397, 408, 405, 
-   406, 398, 399, 397, 408, 405, 406, 398, 399, 409, 397, 408, 405, 406, 398, 399, 
-   409, 410, 412, 419, 420, 413, 421, 412, 422, 419, 420, 413, 423, 424, 425, 412, 
-   419, 420, 413, 412, 422, 419, 420, 413, 412, 422, 419, 420, 413, 423, 412, 422, 
-   419, 420, 413, 423, 424, 428, 433, 434, 429, 435, 428, 436, 433, 434, 429, 437, 
-   438, 439, 428, 433, 434, 429, 428, 436, 433, 434, 429, 428, 436, 433, 434, 429, 
-   437, 428, 436, 433, 434, 429, 437, 438, 441, 454, 442, 447, 448, 443, 449, 442, 
-   450, 447, 448, 443, 451, 452, 453, 442, 447, 448, 443, 442, 450, 447, 448, 443, 
-   442, 450, 447, 448, 443, 451, 442, 450, 447, 448, 443, 451, 452, 456, 448, 442, 
-   443, 457, 458, 456, 448, 442, 443, 459, 460, 461, 456, 448, 442, 443, 458, 456, 
-   448, 442, 443, 458, 456, 448, 442, 443, 459, 458, 456, 448, 442, 443, 459, 460, 
-   463, 464, 465, 463, 469, 470, 464, 465, 471, 463, 472, 469, 470, 464, 465, 473, 
-   474, 475, 463, 469, 470, 464, 465, 463, 472, 469, 470, 464, 465, 463, 472, 469, 
-   470, 464, 465, 473, 463, 472, 469, 470, 464, 465, 473, 474, 478, 470, 463, 464, 
-   465, 479, 480, 478, 470, 463, 464, 465, 481, 482, 483, 478, 470, 463, 464, 465, 
-   480, 478, 470, 463, 464, 465, 480, 478, 470, 463, 464, 465, 481, 480, 478, 470, 
-   463, 464, 465, 481, 482, 486, 434, 428, 429, 487, 488, 486, 434, 428, 429, 489, 
-   490, 491, 486, 434, 428, 429, 488, 486, 434, 428, 429, 488, 486, 434, 428, 429, 
-   489, 488, 486, 434, 428, 429, 489, 490, 496, 501, 502, 497, 503, 496, 504, 501, 
-   502, 497, 505, 506, 507, 496, 501, 502, 497, 496, 504, 501, 502, 497, 496, 504, 
-   501, 502, 497, 505, 496, 504, 501, 502, 497, 505, 506, 510, 502, 496, 497, 511, 
-   512, 510, 502, 496, 497, 513, 514, 515, 510, 502, 496, 497, 512, 510, 502, 496, 
-   497, 512, 510, 502, 496, 497, 513, 512, 510, 502, 496, 497, 513, 514, 516, 521, 
-   522, 517, 523, 516, 524, 521, 522, 517, 525, 526, 527, 516, 521, 522, 517, 516, 
-   524, 521, 522, 517, 516, 524, 521, 522, 517, 525, 516, 524, 521, 522, 517, 525, 
-   526, 530, 556, 572, 542, 573, 584, 531, 532, 543, 541, 542, 533, 536, 537, 540, 
-   537, 539, 540, 531, 549, 550, 532, 543, 551, 531, 552, 549, 550, 532, 543, 553, 
-   554, 555, 531, 549, 550, 532, 543, 531, 552, 549, 550, 532, 543, 531, 552, 549, 
-   550, 532, 543, 553, 531, 552, 549, 550, 532, 543, 553, 554, 557, 558, 559, 557, 
-   565, 566, 558, 559, 567, 557, 568, 565, 566, 558, 559, 569, 570, 571, 557, 565, 
-   566, 558, 559, 557, 568, 565, 566, 558, 559, 557, 568, 565, 566, 558, 559, 569, 
-   557, 568, 565, 566, 558, 559, 569, 570, 572, 533, 542, 573, 572, 577, 542, 573, 
-   578, 579, 572, 533, 541, 542, 533, 573, 572, 580, 577, 542, 573, 578, 581, 582, 
-   583, 572, 577, 542, 573, 578, 572, 580, 577, 542, 573, 578, 572, 580, 577, 542, 
-   573, 578, 581, 572, 580, 577, 542, 573, 578, 581, 582, 592, 530, 556, 572, 541, 
-   542, 533, 573, 584, 587, 588, 591, 588, 590, 591, 592, 530, 556, 572, 542, 573, 
-   584, 596, 602, 598, 599, 600, 601, 598, 599, 600, 603, 608, 612, 616, 620, 624, 
-   598, 622, 623, 598, 625, 626, 627, 598, 625, 626, 607, 633, 634, 635, 607, 633, 
-   634, 637, 630, 638, 639, 640, 637, 630, 638, 637, 630, 638, 639, 642, 643, 647, 
-   648, 649, 653, 654, 655, 660, 661, 662, 666, 667, 668, 672, 673, 674, 677, 678, 
-   679, 683, 684, 685, 689, 690, 691, 695, 696, 697, 701, 702, 703, 707, 708, 709, 
-   713, 714, 715, 721, 722, 723, 729, 730, 731, 735, 736, 737, 740, 741, 742, 745, 
-   746, 747, 751, 752, 753, 757, 758, 759, 763, 764, 765, 769, 770, 771, 775, 776, 
-   777, 782, 786, 788, 792, 779, 782, 786, 788, 792, 793, 794, 798, 799, 800, 804, 
-   805, 806, 810, 811, 808, 810, 811, 812, 813, 817, 819, 815, 817, 819, 820, 821, 
-   824, 825, 823, 824, 825, 834, 835, 838, 839, 840, 843, 858, 842, 843, 858, 844, 
-   846, 847, 844, 851, 852, 846, 847, 853, 844, 854, 851, 852, 846, 847, 855, 856, 
-   857, 844, 851, 852, 846, 847, 844, 854, 851, 852, 846, 847, 844, 854, 851, 852, 
-   846, 847, 855, 844, 854, 851, 852, 846, 847, 855, 856, 860, 852, 844, 846, 847, 
-   861, 862, 860, 852, 844, 846, 847, 863, 864, 865, 860, 852, 844, 846, 847, 862, 
-   860, 852, 844, 846, 847, 862, 860, 852, 844, 846, 847, 863, 862, 860, 852, 844, 
-   846, 847, 863, 864, 866, 867, 870, 883, 869, 870, 883, 871, 876, 877, 872, 878, 
-   871, 879, 876, 877, 872, 880, 881, 882, 871, 876, 877, 872, 871, 879, 876, 877, 
-   872, 871, 879, 876, 877, 872, 880, 871, 879, 876, 877, 872, 880, 881, 885, 877, 
-   871, 872, 886, 887, 885, 877, 871, 872, 888, 889, 890, 885, 877, 871, 872, 887, 
-   885, 877, 871, 872, 887, 885, 877, 871, 872, 888, 887, 885, 877, 871, 872, 888, 
-   889, 891, 892, 895, 902, 907, 908, 903, 909, 902, 910, 907, 908, 903, 911, 912, 
-   913, 902, 907, 908, 903, 902, 910, 907, 908, 903, 902, 910, 907, 908, 903, 911, 
-   902, 910, 907, 908, 903, 911, 912, 916, 908, 902, 903, 917, 918, 916, 908, 902, 
-   903, 919, 920, 921, 916, 908, 902, 903, 918, 916, 908, 902, 903, 918, 916, 908, 
-   902, 903, 919, 918, 916, 908, 902, 903, 919, 920, 931, 940, 923, 926, 927, 930, 
-   927, 929, 930, 949, 952, 941, 944, 945, 948, 945, 947, 948, 955, 643, 647, 958, 
-   649, 653, 961, 655, 660, 964, 662, 666, 967, 668, 672, 970, 674, 677, 973, 679, 
-   683, 976, 685, 689, 979, 691, 695, 982, 697, 701, 985, 703, 707, 988, 709, 713, 
-   991, 715, 721, 994, 723, 729, 997, 731, 735, 1000, 737, 740, 1003, 742, 745, 1006, 
-   747, 751, 1009, 753, 757, 1012, 759, 763, 1015, 765, 769, 1018, 771, 775, 1021, 777, 
-   782, 786, 788, 792, 1024, 794, 798, 1027, 800, 804, 1030, 806, 810, 811, 1033, 813, 
-   817, 819, 1036, 821, 824, 825, 1039, 835, 838, 1042, 840, 843, 858, 1045, 867, 870, 
-   883, 1048, 892, 895, 428, 463, 464, 465, 429, 430, 485, 466, 477, 54, 55, 68, 
-   594, 595, 628, 1, 2, 83, 92, 93, 202, 85, 86, 97, 98, 113, 114, 122, 
-   133, 141, 142, 163, 165, 166, 167, 179, 181, 182, 183, 192, 193, 122, 133, 220, 
-   221, 232, 233, 282, 283, 291, 292, 302, 303, 311, 312, 320, 321, 329, 330, 338, 
-   339, 347, 348, 357, 358, 370, 372, 373, 374, 384, 386, 387, 388, 400, 402, 403, 
-   404, 414, 416, 417, 418, 518, 519, 535, 536, 544, 546, 547, 548, 560, 562, 563, 
-   564, 574, 575, 586, 587, 644, 645, 650, 651, 656, 657, 663, 664, 669, 670, 675, 
-   676, 680, 681, 686, 687, 692, 693, 698, 699, 704, 705, 710, 711, 716, 717, 724, 
-   725, 732, 733, 738, 739, 743, 744, 748, 749, 754, 755, 760, 761, 766, 767, 772, 
-   773, 778, 779, 795, 796, 801, 802, 807, 808, 814, 815, 822, 823, 827, 830, 833, 
-   836, 837, 841, 842, 868, 869, 893, 894, 898, 899, 925, 926, 943, 944, 
+   989, 990, 991, 670, 673, 675, 992, 993, 994, 677, 680, 682, 995, 996, 997, 684, 
+   687, 690, 998, 999, 1000, 692, 695, 697, 1001, 1002, 1003, 699, 702, 704, 1004, 1005, 
+   1006, 706, 709, 710, 1007, 1008, 1009, 712, 715, 717, 1010, 1011, 1012, 719, 722, 724, 
+   1013, 1014, 1015, 726, 729, 731, 1016, 1017, 1018, 733, 736, 738, 1019, 1020, 1021, 740, 
+   743, 747, 1022, 1023, 1024, 749, 752, 756, 1025, 1026, 1027, 758, 762, 1028, 1029, 1030, 
+   764, 767, 1031, 1032, 1033, 769, 772, 1034, 1035, 1036, 774, 778, 1037, 1038, 1039, 780, 
+   784, 1040, 1041, 1042, 786, 790, 1043, 1044, 1045, 792, 796, 1046, 1047, 1048, 798, 802, 
+   1049, 1050, 1051, 804, 809, 813, 815, 819, 1052, 1053, 1054, 821, 825, 1055, 1056, 1057, 
+   827, 831, 1058, 1059, 1060, 833, 837, 838, 1061, 1062, 1063, 840, 844, 846, 1064, 1065, 
+   1066, 848, 851, 1067, 1068, 1069, 862, 865, 1070, 1071, 1072, 867, 870, 1073, 1074, 1075, 
+   894, 897, 1076, 1077, 1078, 919, 922, 1079, 1080, 1081, 924, 910, 885, 852, 276, 277, 
+   285, 286, 287, 296, 297, 8, 305, 306, 9, 314, 315, 10, 323, 324, 12, 332, 
+   333, 13, 341, 342, 343, 351, 352, 15, 928, 945, 946, 957, 669, 676, 683, 691, 
+   698, 705, 711, 718, 725, 732, 739, 748, 757, 763, 768, 773, 779, 785, 791, 797, 
+   803, 820, 826, 832, 839, 847, 861, 866, 893, 918, 923, 482, 483, 504, 505, 496, 
+   415, 428, 450, 464, 472, 385, 386, 400, 401, 387, 355, 356, 370, 371, 357, 256, 
+   267, 194, 61, 70, 71, 180, 2, 3, 6, 3, 5, 6, 18, 31, 19, 24, 
+   25, 20, 26, 19, 27, 24, 25, 20, 28, 29, 30, 19, 24, 25, 20, 19, 
+   27, 24, 25, 20, 19, 27, 24, 25, 20, 28, 19, 27, 24, 25, 20, 28, 
+   29, 33, 25, 19, 20, 34, 35, 33, 25, 19, 20, 36, 37, 38, 33, 25, 
+   19, 20, 35, 33, 25, 19, 20, 35, 33, 25, 19, 20, 36, 35, 33, 25, 
+   19, 20, 36, 37, 69, 70, 71, 180, 61, 64, 65, 68, 65, 67, 68, 72, 
+   73, 82, 83, 98, 169, 81, 82, 83, 98, 99, 73, 76, 77, 80, 77, 79, 
+   80, 84, 85, 101, 86, 87, 137, 153, 129, 82, 83, 88, 89, 98, 118, 82, 
+   83, 97, 98, 99, 89, 92, 93, 96, 93, 95, 96, 84, 104, 105, 85, 101, 
+   106, 84, 107, 104, 105, 85, 101, 108, 109, 110, 84, 104, 105, 85, 101, 84, 
+   107, 104, 105, 85, 101, 84, 107, 104, 105, 85, 101, 108, 84, 107, 104, 105, 
+   85, 101, 108, 109, 112, 105, 84, 85, 101, 113, 114, 112, 105, 84, 85, 101, 
+   115, 116, 117, 112, 105, 84, 85, 101, 114, 112, 105, 84, 85, 101, 114, 112, 
+   105, 84, 85, 101, 115, 114, 112, 105, 84, 85, 101, 115, 116, 82, 83, 88, 
+   122, 98, 118, 123, 124, 82, 83, 88, 89, 97, 98, 99, 89, 118, 82, 83, 
+   88, 125, 122, 98, 118, 123, 126, 127, 128, 82, 83, 88, 122, 98, 118, 123, 
+   82, 83, 88, 125, 122, 98, 118, 123, 82, 83, 88, 125, 122, 98, 118, 123, 
+   126, 82, 83, 88, 125, 122, 98, 118, 123, 126, 127, 82, 83, 131, 88, 98, 
+   118, 123, 132, 82, 83, 133, 131, 88, 98, 118, 123, 134, 135, 136, 82, 83, 
+   131, 88, 98, 118, 123, 82, 83, 133, 131, 88, 98, 118, 123, 82, 83, 133, 
+   131, 88, 98, 118, 123, 134, 82, 83, 133, 131, 88, 98, 118, 123, 134, 135, 
+   138, 139, 140, 82, 83, 89, 98, 99, 138, 146, 147, 139, 140, 148, 138, 149, 
+   146, 147, 139, 140, 150, 151, 152, 138, 146, 147, 139, 140, 138, 149, 146, 147, 
+   139, 140, 138, 149, 146, 147, 139, 140, 150, 138, 149, 146, 147, 139, 140, 150, 
+   151, 154, 155, 156, 154, 162, 163, 155, 156, 164, 154, 165, 162, 163, 155, 156, 
+   166, 167, 168, 154, 162, 163, 155, 156, 154, 165, 162, 163, 155, 156, 154, 165, 
+   162, 163, 155, 156, 166, 154, 165, 162, 163, 155, 156, 166, 167, 72, 173, 82, 
+   83, 98, 169, 174, 175, 72, 73, 81, 82, 83, 98, 99, 73, 169, 72, 176, 
+   173, 82, 83, 98, 169, 174, 177, 178, 179, 72, 173, 82, 83, 98, 169, 174, 
+   72, 176, 173, 82, 83, 98, 169, 174, 72, 176, 173, 82, 83, 98, 169, 174, 
+   177, 72, 176, 173, 82, 83, 98, 169, 174, 177, 178, 182, 72, 82, 83, 98, 
+   169, 174, 183, 184, 182, 72, 82, 83, 98, 169, 174, 185, 186, 187, 182, 72, 
+   82, 83, 98, 169, 174, 184, 182, 72, 82, 83, 98, 169, 174, 184, 182, 72, 
+   82, 83, 98, 169, 174, 185, 184, 182, 72, 82, 83, 98, 169, 174, 185, 186, 
+   196, 205, 206, 229, 204, 205, 206, 229, 196, 199, 200, 203, 200, 202, 203, 207, 
+   208, 217, 218, 216, 217, 208, 211, 212, 215, 212, 214, 215, 207, 222, 217, 218, 
+   223, 224, 207, 208, 216, 217, 208, 218, 207, 225, 222, 217, 218, 223, 226, 227, 
+   228, 207, 222, 217, 218, 223, 207, 225, 222, 217, 218, 223, 207, 225, 222, 217, 
+   218, 223, 226, 207, 225, 222, 217, 218, 223, 226, 227, 231, 207, 217, 218, 223, 
+   232, 233, 231, 207, 217, 218, 223, 234, 235, 236, 231, 207, 217, 218, 223, 233, 
+   231, 207, 217, 218, 223, 233, 231, 207, 217, 218, 223, 234, 233, 231, 207, 217, 
+   218, 223, 234, 235, 271, 272, 275, 272, 274, 275, 280, 281, 284, 281, 283, 284, 
+   285, 286, 287, 291, 292, 295, 292, 294, 295, 296, 297, 8, 300, 301, 304, 301, 
+   303, 304, 305, 306, 9, 309, 310, 313, 310, 312, 313, 314, 315, 10, 318, 319, 
+   322, 319, 321, 322, 323, 324, 12, 327, 328, 331, 328, 330, 331, 332, 333, 13, 
+   336, 337, 340, 337, 339, 340, 341, 342, 343, 346, 347, 350, 347, 349, 350, 351, 
+   352, 15, 355, 356, 357, 355, 363, 364, 356, 357, 365, 355, 366, 363, 364, 356, 
+   357, 367, 368, 369, 355, 363, 364, 356, 357, 355, 366, 363, 364, 356, 357, 355, 
+   366, 363, 364, 356, 357, 367, 355, 366, 363, 364, 356, 357, 367, 368, 370, 377, 
+   378, 371, 379, 370, 380, 377, 378, 371, 381, 382, 383, 370, 377, 378, 371, 370, 
+   380, 377, 378, 371, 370, 380, 377, 378, 371, 381, 370, 380, 377, 378, 371, 381, 
+   382, 385, 386, 387, 385, 393, 394, 386, 387, 395, 385, 396, 393, 394, 386, 387, 
+   397, 398, 399, 385, 393, 394, 386, 387, 385, 396, 393, 394, 386, 387, 385, 396, 
+   393, 394, 386, 387, 397, 385, 396, 393, 394, 386, 387, 397, 398, 400, 407, 408, 
+   401, 409, 400, 410, 407, 408, 401, 411, 412, 413, 400, 407, 408, 401, 400, 410, 
+   407, 408, 401, 400, 410, 407, 408, 401, 411, 400, 410, 407, 408, 401, 411, 412, 
+   416, 421, 422, 417, 423, 416, 424, 421, 422, 417, 425, 426, 427, 416, 421, 422, 
+   417, 416, 424, 421, 422, 417, 416, 424, 421, 422, 417, 425, 416, 424, 421, 422, 
+   417, 425, 426, 429, 442, 430, 435, 436, 431, 437, 430, 438, 435, 436, 431, 439, 
+   440, 441, 430, 435, 436, 431, 430, 438, 435, 436, 431, 430, 438, 435, 436, 431, 
+   439, 430, 438, 435, 436, 431, 439, 440, 444, 436, 430, 431, 445, 446, 444, 436, 
+   430, 431, 447, 448, 449, 444, 436, 430, 431, 446, 444, 436, 430, 431, 446, 444, 
+   436, 430, 431, 447, 446, 444, 436, 430, 431, 447, 448, 451, 452, 453, 451, 457, 
+   458, 452, 453, 459, 451, 460, 457, 458, 452, 453, 461, 462, 463, 451, 457, 458, 
+   452, 453, 451, 460, 457, 458, 452, 453, 451, 460, 457, 458, 452, 453, 461, 451, 
+   460, 457, 458, 452, 453, 461, 462, 466, 458, 451, 452, 453, 467, 468, 466, 458, 
+   451, 452, 453, 469, 470, 471, 466, 458, 451, 452, 453, 468, 466, 458, 451, 452, 
+   453, 468, 466, 458, 451, 452, 453, 469, 468, 466, 458, 451, 452, 453, 469, 470, 
+   474, 422, 416, 417, 475, 476, 474, 422, 416, 417, 477, 478, 479, 474, 422, 416, 
+   417, 476, 474, 422, 416, 417, 476, 474, 422, 416, 417, 477, 476, 474, 422, 416, 
+   417, 477, 478, 484, 489, 490, 485, 491, 484, 492, 489, 490, 485, 493, 494, 495, 
+   484, 489, 490, 485, 484, 492, 489, 490, 485, 484, 492, 489, 490, 485, 493, 484, 
+   492, 489, 490, 485, 493, 494, 498, 490, 484, 485, 499, 500, 498, 490, 484, 485, 
+   501, 502, 503, 498, 490, 484, 485, 500, 498, 490, 484, 485, 500, 498, 490, 484, 
+   485, 501, 500, 498, 490, 484, 485, 501, 502, 504, 509, 510, 505, 511, 504, 512, 
+   509, 510, 505, 513, 514, 515, 504, 509, 510, 505, 504, 512, 509, 510, 505, 504, 
+   512, 509, 510, 505, 513, 504, 512, 509, 510, 505, 513, 514, 519, 520, 557, 583, 
+   599, 569, 600, 611, 558, 559, 570, 568, 569, 560, 563, 564, 567, 564, 566, 567, 
+   558, 576, 577, 559, 570, 578, 558, 579, 576, 577, 559, 570, 580, 581, 582, 558, 
+   576, 577, 559, 570, 558, 579, 576, 577, 559, 570, 558, 579, 576, 577, 559, 570, 
+   580, 558, 579, 576, 577, 559, 570, 580, 581, 584, 585, 586, 584, 592, 593, 585, 
+   586, 594, 584, 595, 592, 593, 585, 586, 596, 597, 598, 584, 592, 593, 585, 586, 
+   584, 595, 592, 593, 585, 586, 584, 595, 592, 593, 585, 586, 596, 584, 595, 592, 
+   593, 585, 586, 596, 597, 599, 560, 569, 600, 599, 604, 569, 600, 605, 606, 599, 
+   560, 568, 569, 560, 600, 599, 607, 604, 569, 600, 605, 608, 609, 610, 599, 604, 
+   569, 600, 605, 599, 607, 604, 569, 600, 605, 599, 607, 604, 569, 600, 605, 608, 
+   599, 607, 604, 569, 600, 605, 608, 609, 619, 557, 583, 599, 568, 569, 560, 600, 
+   611, 614, 615, 618, 615, 617, 618, 619, 557, 583, 599, 569, 600, 611, 623, 629, 
+   625, 626, 627, 628, 625, 626, 627, 630, 635, 639, 643, 647, 651, 625, 649, 650, 
+   625, 652, 653, 654, 625, 652, 653, 634, 660, 661, 662, 634, 660, 661, 664, 657, 
+   665, 666, 667, 664, 657, 665, 664, 657, 665, 666, 669, 670, 673, 675, 672, 673, 
+   675, 676, 677, 680, 682, 679, 680, 682, 683, 684, 687, 690, 686, 687, 690, 691, 
+   692, 695, 697, 694, 695, 697, 698, 699, 702, 704, 701, 702, 704, 705, 706, 709, 
+   710, 708, 709, 710, 711, 712, 715, 717, 714, 715, 717, 718, 719, 722, 724, 721, 
+   722, 724, 725, 726, 729, 731, 728, 729, 731, 732, 733, 736, 738, 735, 736, 738, 
+   739, 740, 743, 747, 742, 743, 747, 748, 749, 752, 756, 751, 752, 756, 757, 758, 
+   762, 763, 764, 767, 768, 769, 772, 773, 774, 778, 779, 780, 784, 785, 786, 790, 
+   791, 792, 796, 797, 798, 802, 803, 804, 809, 813, 815, 819, 806, 809, 813, 815, 
+   819, 820, 821, 825, 826, 827, 831, 832, 833, 837, 838, 835, 837, 838, 839, 840, 
+   844, 846, 842, 844, 846, 847, 848, 851, 852, 850, 851, 852, 861, 862, 865, 866, 
+   867, 870, 885, 869, 870, 885, 871, 873, 874, 871, 878, 879, 873, 874, 880, 871, 
+   881, 878, 879, 873, 874, 882, 883, 884, 871, 878, 879, 873, 874, 871, 881, 878, 
+   879, 873, 874, 871, 881, 878, 879, 873, 874, 882, 871, 881, 878, 879, 873, 874, 
+   882, 883, 887, 879, 871, 873, 874, 888, 889, 887, 879, 871, 873, 874, 890, 891, 
+   892, 887, 879, 871, 873, 874, 889, 887, 879, 871, 873, 874, 889, 887, 879, 871, 
+   873, 874, 890, 889, 887, 879, 871, 873, 874, 890, 891, 893, 894, 897, 910, 896, 
+   897, 910, 898, 903, 904, 899, 905, 898, 906, 903, 904, 899, 907, 908, 909, 898, 
+   903, 904, 899, 898, 906, 903, 904, 899, 898, 906, 903, 904, 899, 907, 898, 906, 
+   903, 904, 899, 907, 908, 912, 904, 898, 899, 913, 914, 912, 904, 898, 899, 915, 
+   916, 917, 912, 904, 898, 899, 914, 912, 904, 898, 899, 914, 912, 904, 898, 899, 
+   915, 914, 912, 904, 898, 899, 915, 916, 918, 919, 922, 936, 945, 928, 931, 932, 
+   935, 932, 934, 935, 954, 957, 946, 949, 950, 953, 950, 952, 953, 989, 670, 673, 
+   675, 992, 677, 680, 682, 995, 684, 687, 690, 998, 692, 695, 697, 1001, 699, 702, 
+   704, 1004, 706, 709, 710, 1007, 712, 715, 717, 1010, 719, 722, 724, 1013, 726, 729, 
+   731, 1016, 733, 736, 738, 1019, 740, 743, 747, 1022, 749, 752, 756, 1025, 758, 762, 
+   1028, 764, 767, 1031, 769, 772, 1034, 774, 778, 1037, 780, 784, 1040, 786, 790, 1043, 
+   792, 796, 1046, 798, 802, 1049, 804, 809, 813, 815, 819, 1052, 821, 825, 1055, 827, 
+   831, 1058, 833, 837, 838, 1061, 840, 844, 846, 1064, 848, 851, 852, 1067, 862, 865, 
+   1070, 867, 870, 885, 1073, 894, 897, 910, 1076, 919, 922, 416, 451, 452, 453, 417, 
+   418, 473, 454, 465, 17, 18, 31, 974, 977, 980, 982, 986, 966, 968, 970, 961, 
+   963, 621, 622, 655, 552, 554, 240, 243, 246, 1, 2, 61, 70, 71, 180, 63, 
+   64, 75, 76, 91, 92, 100, 111, 119, 120, 141, 143, 144, 145, 157, 159, 160, 
+   161, 170, 171, 100, 111, 198, 199, 210, 211, 270, 271, 279, 280, 290, 291, 299, 
+   300, 308, 309, 317, 318, 326, 327, 335, 336, 345, 346, 358, 360, 361, 362, 372, 
+   374, 375, 376, 388, 390, 391, 392, 402, 404, 405, 406, 506, 507, 562, 563, 571, 
+   573, 574, 575, 587, 589, 590, 591, 601, 602, 613, 614, 671, 672, 678, 679, 685, 
+   686, 693, 694, 700, 701, 707, 708, 713, 714, 720, 721, 727, 728, 734, 735, 741, 
+   742, 750, 751, 759, 760, 765, 766, 770, 771, 775, 776, 781, 782, 787, 788, 793, 
+   794, 799, 800, 805, 806, 822, 823, 828, 829, 834, 835, 841, 842, 849, 850, 854, 
+   857, 860, 863, 864, 868, 869, 895, 896, 920, 921, 925, 926, 930, 931, 948, 949, 
 };
 private static final boolean jjCanMove_0(int hiByte, int i1, int i2, long l1, long l2)
 {
@@ -8187,7 +8146,7 @@ private static final boolean jjCanMove_0(int hiByte, int i1, int i2, long l1, lo
 null, null, null, null, null, null, null, null, null, null, null, null, null, null, 
 null, null, null, null, null, null, null, null, null, null, null, null, null, null, 
 null, null, null, null, null, null, null, null, null, null, null, null, null, null, 
-null, "\41", "\44", "\45", "\46", "\140", "\77", "\74", "\174", "\74\75", };
+null, null, "\41", "\44", "\45", "\46", "\140", "\77", "\74", "\174", "\74\75", };
 protected Token jjFillToken()
 {
    final Token t;
@@ -8349,7 +8308,7 @@ private void ReInitRounds()
   {
     int i;
     jjround = 0x80000001;
-    for (i = 1054; i-- > 0;)
+    for (i = 1082; i-- > 0;)
       jjrounds[i] = 0x80000000;
   }
 
@@ -8374,7 +8333,7 @@ public void SwitchTo(int lexState)
    "DEFAULT",
 };
 static final long[] jjtoToken = {
-   0xffffffffffe00001L, 0xff803fffffffffffL, 0x3ffffffL, 
+   0xffffffffffe00001L, 0xff803fffffffffffL, 0x7ffffffL, 
 };
 static final long[] jjtoSkip = {
    0x2L, 0x0L, 0x0L, 
@@ -8384,8 +8343,8 @@ public void SwitchTo(int lexState)
 };
     protected SimpleCharStream  input_stream;
 
-    private final int[] jjrounds = new int[1054];
-    private final int[] jjstateSet = new int[2 * 1054];
+    private final int[] jjrounds = new int[1082];
+    private final int[] jjstateSet = new int[2 * 1082];
 
     
     protected char curChar;
diff --git a/org/w3c/css/properties/CSS3Properties.properties b/org/w3c/css/properties/CSS3Properties.properties
index 6fab7ac2b..a61820d01 100644
--- a/org/w3c/css/properties/CSS3Properties.properties
+++ b/org/w3c/css/properties/CSS3Properties.properties
@@ -78,6 +78,7 @@ border-block-end:                       org.w3c.css.properties.css3.CssBorderBlo
 border-block:                           org.w3c.css.properties.css3.CssBorderBlock
 border-inline-color:                    org.w3c.css.properties.css3.CssBorderInlineColor
 border-inline-start-color:              org.w3c.css.properties.css3.CssBorderInlineStartColor
+border-inline-end-color:                org.w3c.css.properties.css3.CssBorderInlineEndColor
 border-inline-style:                    org.w3c.css.properties.css3.CssBorderInlineStyle
 border-inline-start-style:              org.w3c.css.properties.css3.CssBorderInlineStartStyle
 border-inline-end-style:                org.w3c.css.properties.css3.CssBorderInlineEndStyle
@@ -109,6 +110,7 @@ will-change:                            org.w3c.css.properties.css3.CssWillChang
 
 # contain
 contain:                                org.w3c.css.properties.css3.CssContain
+content-visibility:                     org.w3c.css.properties.css3.CssContentVisibility
 
 # touch-action
 touch-action:                           org.w3c.css.properties.css3.CssTouchAction
@@ -192,11 +194,19 @@ overflow-wrap:                          org.w3c.css.properties.css3.CssOverflowW
 #alias per spec
 word-wrap:                              org.w3c.css.properties.css3.CssOverflowWrap
 word-break:                             org.w3c.css.properties.css3.CssWordBreak
+hanging-punctuation:                    org.w3c.css.properties.css3.CssHangingPunctuation
+hyphenate-character:			org.w3c.css.properties.css3.CssHyphenateCharacter
+hyphenate-limit-chars:			org.w3c.css.properties.css3.CssHyphenateLimitChars
+hyphenate-limit-last:			org.w3c.css.properties.css3.CssHyphenateLimitLast
+hyphenate-limit-lines:			org.w3c.css.properties.css3.CssHyphenateLimitLines
+hyphenate-limit-zone:			org.w3c.css.properties.css3.CssHyphenateLimitZone
 hyphens:                                org.w3c.css.properties.css3.CssHyphens
 line-break:                             org.w3c.css.properties.css3.CssLineBreak
+line-padding:				org.w3c.css.properties.css3.CssLinePadding
 text-align:                             org.w3c.css.properties.css3.CssTextAlign
 text-align-all:                         org.w3c.css.properties.css3.CssTextAlignAll
 text-align-last:                        org.w3c.css.properties.css3.CssTextAlignLast
+text-autospace:				org.w3c.css.properties.css3.CssTextAutospace
 text-indent:                            org.w3c.css.properties.css3.CssTextIndent
 text-justify:                           org.w3c.css.properties.css3.CssTextJustify
 text-transform:                         org.w3c.css.properties.css3.CssTextTransform
@@ -215,15 +225,26 @@ text-emphasis:                          org.w3c.css.properties.css3.CssTextEmpha
 text-emphasis-color:                    org.w3c.css.properties.css3.CssTextEmphasisColor
 text-emphasis-position:                 org.w3c.css.properties.css3.CssTextEmphasisPosition
 text-emphasis-style:                    org.w3c.css.properties.css3.CssTextEmphasisStyle
+text-group-align:			org.w3c.css.properties.css3.CssTextGroupAlign
 text-size-adjust:                       org.w3c.css.properties.css3.CssTextSizeAdjust
+text-spacing:				org.w3c.css.properties.css3.CssTextSpacing
+text-spacing-trim:			org.w3c.css.properties.css3.CssTextSpacingTrim
 text-underline-offset:                  org.w3c.css.properties.css3.CssTextUnderlineOffset
 text-underline-position:                org.w3c.css.properties.css3.CssTextUnderlinePosition
+text-wrap:				org.w3c.css.properties.css3.CssTextWrap
+text-wrap-mode:				org.w3c.css.properties.css3.CssTextWrapMode
+text-wrap-style:			org.w3c.css.properties.css3.CssTextWrapStyle
 tab-size:                               org.w3c.css.properties.css3.CssTabSize
-hanging-punctuation:                    org.w3c.css.properties.css3.CssHangingPunctuation
+wrap-after:				org.w3c.css.properties.css3.CssWrapAfter
+wrap-before:				org.w3c.css.properties.css3.CssWrapBefore
+wrap-inside:				org.w3c.css.properties.css3.CssWrapInside
+white-space-collapse:			org.w3c.css.properties.css3.CssWhiteSpaceCollapse
+white-space-trim:			org.w3c.css.properties.css3.CssWhiteSpaceTrim
 
 text-combine-upright:                   org.w3c.css.properties.css3.CssTextCombineUpright
 text-orientation:                       org.w3c.css.properties.css3.CssTextOrientation
 glyph-orientation-vertical:             org.w3c.css.properties.css3.CssGlyphOrientationVertical
+word-space-transform:			org.w3c.css.properties.css3.CssWordSpaceTransform
 
 
 # marquee
@@ -273,9 +294,12 @@ transform-style:                        org.w3c.css.properties.css3.CssTransform
 backface-visibility:                    org.w3c.css.properties.css3.CssBackfaceVisibility
 perspective:                            org.w3c.css.properties.css3.CssPerspective
 perspective-origin:                     org.w3c.css.properties.css3.CssPerspectiveOrigin
+rotate:					org.w3c.css.properties.css3.CssRotate
+scale:					org.w3c.css.properties.css3.CssScale
 transform-origin:                       org.w3c.css.properties.css3.CssTransformOrigin
 transform-box:                          org.w3c.css.properties.css3.CssTransformBox
 transform:                              org.w3c.css.properties.css3.CssTransform
+translate:				org.w3c.css.properties.css3.CssTranslate
 
 # image
 object-fit:                             org.w3c.css.properties.css3.CssObjectFit
@@ -466,6 +490,13 @@ initial-letter-align:                   org.w3c.css.properties.css3.CssInitialLe
 initial-letter-wrap:                    org.w3c.css.properties.css3.CssInitialLetterWrap
 inline-sizing:                          org.w3c.css.properties.css3.CssInlineSizing
 
+# CSS Overscroll
+overscroll-behavior:                    org.w3c.css.properties.css3.CssOverscrollBehavior
+overscroll-behavior-x:                  org.w3c.css.properties.css3.CssOverscrollBehaviorX
+overscroll-behavior-y:                  org.w3c.css.properties.css3.CssOverscrollBehaviorY
+overscroll-behavior-block:              org.w3c.css.properties.css3.CssOverscrollBehaviorBlock
+overscroll-behavior-inline:             org.w3c.css.properties.css3.CssOverscrollBehaviorInline
+
 # CSS Multi-column Layout Module
 # http://www.w3.org/TR/css3-multicol/
 columns:	                            org.w3c.css.properties.css3.CssColumns
@@ -528,6 +559,7 @@ mf.environment-blending:                org.w3c.css.atrules.css3.media.MediaEnvi
 mf.forced-colors:                       org.w3c.css.atrules.css3.media.MediaForcedColors
 mf.grid:                                org.w3c.css.atrules.css3.media.MediaGrid
 mf.height:                              org.w3c.css.atrules.css3.media.MediaHeight
+mf.horizontal-viewport-segments         org.w3c.css.atrules.css3.media.MediaHorizontalViewportSegments
 mf.hover:                               org.w3c.css.atrules.css3.media.MediaHover
 mf.inverted-colors:                     org.w3c.css.atrules.css3.media.MediaInvertedColors
 mf.monochrome:                          org.w3c.css.atrules.css3.media.MediaMonochrome
@@ -538,11 +570,12 @@ mf.pointer:                             org.w3c.css.atrules.css3.media.MediaPoin
 mf.prefers-color-scheme                 org.w3c.css.atrules.css3.media.MediaPrefersColorScheme
 mf.prefers-contrast:                    org.w3c.css.atrules.css3.media.MediaPrefersContrast
 mf.prefers-reduced-motion:              org.w3c.css.atrules.css3.media.MediaPrefersReducedMotion
-mf.prefers-reduced-motion-transparency: org.w3c.css.atrules.css3.media.MediaPrefersReducedTransparency
+mf.prefers-reduced-transparency:        org.w3c.css.atrules.css3.media.MediaPrefersReducedTransparency
 mf.resolution:                          org.w3c.css.atrules.css3.media.MediaResolution
 mf.scan:                                org.w3c.css.atrules.css3.media.MediaScan
 mf.scripting:                           org.w3c.css.atrules.css3.media.MediaScripting
 mf.update:                              org.w3c.css.atrules.css3.media.MediaUpdate
+mf.vertical-viewport-segments           org.w3c.css.atrules.css3.media.MediaVerticalViewportSegments
 mf.video-color-gamut:                   org.w3c.css.atrules.css3.media.MediaVideoColorGamut
 mf.video-dynamic-range:                 org.w3c.css.atrules.css3.media.MediaVideoDynamicRange
 mf.view-mode:                           org.w3c.css.atrules.css3.media.ViewMode
diff --git a/org/w3c/css/properties/css/CssContentVisibility.java b/org/w3c/css/properties/css/CssContentVisibility.java
new file mode 100644
index 000000000..8b859201a
--- /dev/null
+++ b/org/w3c/css/properties/css/CssContentVisibility.java
@@ -0,0 +1,113 @@
+//
+// Author: Yves Lafon 
+//
+// (c) COPYRIGHT MIT, ERCIM, Keio, Beihang, 2022.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.properties.css;
+
+import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css3.Css3Style;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+
+/**
+ * @since CSS3
+ */
+public class CssContentVisibility extends CssProperty {
+
+    /**
+     * Create a new CssContentVisibility
+     */
+    public CssContentVisibility() {
+    }
+
+    /**
+     * Creates a new CssContentVisibility
+     *
+     * @param expression The expression for this property
+     * @throws InvalidParamException
+     *          Expressions are incorrect
+     */
+    public CssContentVisibility(ApplContext ac, CssExpression expression, boolean check)
+            throws InvalidParamException {
+        throw new InvalidParamException("value",
+                expression.getValue().toString(),
+                getPropertyName(), ac);
+    }
+
+    public CssContentVisibility(ApplContext ac, CssExpression expression)
+            throws InvalidParamException {
+        this(ac, expression, false);
+    }
+
+    /**
+     * Returns the value of this property
+     */
+    public Object get() {
+        return value;
+    }
+
+
+    /**
+     * Returns the name of this property
+     */
+    public final String getPropertyName() {
+        return "content-visibility";
+    }
+
+    /**
+     * Returns true if this property is "softly" inherited
+     * e.g. his value is equals to inherit
+     */
+    public boolean isSoftlyInherited() {
+        return value.equals(inherit);
+    }
+
+    /**
+     * Returns a string representation of the object.
+     */
+    public String toString() {
+        return value.toString();
+    }
+
+    /**
+     * Add this property to the CssStyle.
+     *
+     * @param style The CssStyle
+     */
+    public void addToStyle(ApplContext ac, CssStyle style) {
+        Css3Style s = (Css3Style) style;
+        if (s.cssContentVisibility != null) {
+            style.addRedefinitionWarning(ac, this);
+        }
+        s.cssContentVisibility = this;
+    }
+
+
+    /**
+     * Compares two properties for equality.
+     *
+     * @param property The other property.
+     */
+    public boolean equals(CssProperty property) {
+        return (property instanceof CssContentVisibility &&
+                value.equals(((CssContentVisibility) property).value));
+    }
+
+
+    /**
+     * Get this property in the style.
+     *
+     * @param style   The style where the property is
+     * @param resolve if true, resolve the style to find this property
+     */
+    public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
+        if (resolve) {
+            return ((Css3Style) style).getContentVisibility();
+        } else {
+            return ((Css3Style) style).cssContentVisibility;
+        }
+    }
+}
+
diff --git a/org/w3c/css/properties/css/CssHyphenateCharacter.java b/org/w3c/css/properties/css/CssHyphenateCharacter.java
new file mode 100644
index 000000000..d6f1f61a1
--- /dev/null
+++ b/org/w3c/css/properties/css/CssHyphenateCharacter.java
@@ -0,0 +1,112 @@
+//
+// Author: Yves Lafon 
+//
+// (c) COPYRIGHT MIT, ERCIM, Keio, Beihang, 2022.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.properties.css;
+
+import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css3.Css3Style;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+
+/**
+ * @since CSS3
+ */
+public class CssHyphenateCharacter extends CssProperty {
+
+    /**
+     * Create a new CssHyphenateCharacter
+     */
+    public CssHyphenateCharacter() {
+    }
+
+    /**
+     * Creates a new CssHyphenateCharacter
+     *
+     * @param expression The expression for this property
+     * @throws InvalidParamException Expressions are incorrect
+     */
+    public CssHyphenateCharacter(ApplContext ac, CssExpression expression, boolean check)
+            throws InvalidParamException {
+        throw new InvalidParamException("value",
+                expression.getValue().toString(),
+                getPropertyName(), ac);
+    }
+
+    public CssHyphenateCharacter(ApplContext ac, CssExpression expression)
+            throws InvalidParamException {
+        this(ac, expression, false);
+    }
+
+    /**
+     * Returns the value of this property
+     */
+    public Object get() {
+        return value;
+    }
+
+
+    /**
+     * Returns the name of this property
+     */
+    public final String getPropertyName() {
+        return "hyphenate-character";
+    }
+
+    /**
+     * Returns true if this property is "softly" inherited
+     * e.g. his value is equals to inherit
+     */
+    public boolean isSoftlyInherited() {
+        return value.equals(inherit);
+    }
+
+    /**
+     * Returns a string representation of the object.
+     */
+    public String toString() {
+        return value.toString();
+    }
+
+    /**
+     * Add this property to the CssStyle.
+     *
+     * @param style The CssStyle
+     */
+    public void addToStyle(ApplContext ac, CssStyle style) {
+        Css3Style s = (Css3Style) style;
+        if (s.cssHyphenateCharacter != null) {
+            style.addRedefinitionWarning(ac, this);
+        }
+        s.cssHyphenateCharacter = this;
+    }
+
+
+    /**
+     * Compares two properties for equality.
+     *
+     * @param property The other property.
+     */
+    public boolean equals(CssProperty property) {
+        return (property instanceof CssHyphenateCharacter &&
+                value.equals(((CssHyphenateCharacter) property).value));
+    }
+
+
+    /**
+     * Get this property in the style.
+     *
+     * @param style   The style where the property is
+     * @param resolve if true, resolve the style to find this property
+     */
+    public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
+        if (resolve) {
+            return ((Css3Style) style).getHyphenateCharacter();
+        } else {
+            return ((Css3Style) style).cssHyphenateCharacter;
+        }
+    }
+}
+
diff --git a/org/w3c/css/properties/css/CssHyphenateLimitChars.java b/org/w3c/css/properties/css/CssHyphenateLimitChars.java
new file mode 100644
index 000000000..125cee3eb
--- /dev/null
+++ b/org/w3c/css/properties/css/CssHyphenateLimitChars.java
@@ -0,0 +1,112 @@
+//
+// Author: Yves Lafon 
+//
+// (c) COPYRIGHT MIT, ERCIM, Keio, Beihang, 2022.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.properties.css;
+
+import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css3.Css3Style;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+
+/**
+ * @since CSS3
+ */
+public class CssHyphenateLimitChars extends CssProperty {
+
+    /**
+     * Create a new CssHyphenateLimitChars
+     */
+    public CssHyphenateLimitChars() {
+    }
+
+    /**
+     * Creates a new CssHyphenateLimitChars
+     *
+     * @param expression The expression for this property
+     * @throws InvalidParamException Expressions are incorrect
+     */
+    public CssHyphenateLimitChars(ApplContext ac, CssExpression expression, boolean check)
+            throws InvalidParamException {
+        throw new InvalidParamException("value",
+                expression.getValue().toString(),
+                getPropertyName(), ac);
+    }
+
+    public CssHyphenateLimitChars(ApplContext ac, CssExpression expression)
+            throws InvalidParamException {
+        this(ac, expression, false);
+    }
+
+    /**
+     * Returns the value of this property
+     */
+    public Object get() {
+        return value;
+    }
+
+
+    /**
+     * Returns the name of this property
+     */
+    public final String getPropertyName() {
+        return "hyphenate-limit-chars";
+    }
+
+    /**
+     * Returns true if this property is "softly" inherited
+     * e.g. his value is equals to inherit
+     */
+    public boolean isSoftlyInherited() {
+        return value.equals(inherit);
+    }
+
+    /**
+     * Returns a string representation of the object.
+     */
+    public String toString() {
+        return value.toString();
+    }
+
+    /**
+     * Add this property to the CssStyle.
+     *
+     * @param style The CssStyle
+     */
+    public void addToStyle(ApplContext ac, CssStyle style) {
+        Css3Style s = (Css3Style) style;
+        if (s.cssHyphenateLimitChars != null) {
+            style.addRedefinitionWarning(ac, this);
+        }
+        s.cssHyphenateLimitChars = this;
+    }
+
+
+    /**
+     * Compares two properties for equality.
+     *
+     * @param property The other property.
+     */
+    public boolean equals(CssProperty property) {
+        return (property instanceof CssHyphenateLimitChars &&
+                value.equals(((CssHyphenateLimitChars) property).value));
+    }
+
+
+    /**
+     * Get this property in the style.
+     *
+     * @param style   The style where the property is
+     * @param resolve if true, resolve the style to find this property
+     */
+    public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
+        if (resolve) {
+            return ((Css3Style) style).getHyphenateLimitChars();
+        } else {
+            return ((Css3Style) style).cssHyphenateLimitChars;
+        }
+    }
+}
+
diff --git a/org/w3c/css/properties/css/CssHyphenateLimitLast.java b/org/w3c/css/properties/css/CssHyphenateLimitLast.java
new file mode 100644
index 000000000..ff9a138cd
--- /dev/null
+++ b/org/w3c/css/properties/css/CssHyphenateLimitLast.java
@@ -0,0 +1,112 @@
+//
+// Author: Yves Lafon 
+//
+// (c) COPYRIGHT MIT, ERCIM, Keio, Beihang, 2022.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.properties.css;
+
+import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css3.Css3Style;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+
+/**
+ * @since CSS3
+ */
+public class CssHyphenateLimitLast extends CssProperty {
+
+    /**
+     * Create a new CssHyphenateLimitLast
+     */
+    public CssHyphenateLimitLast() {
+    }
+
+    /**
+     * Creates a new CssHyphenateLimitLast
+     *
+     * @param expression The expression for this property
+     * @throws InvalidParamException Expressions are incorrect
+     */
+    public CssHyphenateLimitLast(ApplContext ac, CssExpression expression, boolean check)
+            throws InvalidParamException {
+        throw new InvalidParamException("value",
+                expression.getValue().toString(),
+                getPropertyName(), ac);
+    }
+
+    public CssHyphenateLimitLast(ApplContext ac, CssExpression expression)
+            throws InvalidParamException {
+        this(ac, expression, false);
+    }
+
+    /**
+     * Returns the value of this property
+     */
+    public Object get() {
+        return value;
+    }
+
+
+    /**
+     * Returns the name of this property
+     */
+    public final String getPropertyName() {
+        return "hyphenate-limit-last";
+    }
+
+    /**
+     * Returns true if this property is "softly" inherited
+     * e.g. his value is equals to inherit
+     */
+    public boolean isSoftlyInherited() {
+        return value.equals(inherit);
+    }
+
+    /**
+     * Returns a string representation of the object.
+     */
+    public String toString() {
+        return value.toString();
+    }
+
+    /**
+     * Add this property to the CssStyle.
+     *
+     * @param style The CssStyle
+     */
+    public void addToStyle(ApplContext ac, CssStyle style) {
+        Css3Style s = (Css3Style) style;
+        if (s.cssHyphenateLimitLast != null) {
+            style.addRedefinitionWarning(ac, this);
+        }
+        s.cssHyphenateLimitLast = this;
+    }
+
+
+    /**
+     * Compares two properties for equality.
+     *
+     * @param property The other property.
+     */
+    public boolean equals(CssProperty property) {
+        return (property instanceof CssHyphenateLimitLast &&
+                value.equals(((CssHyphenateLimitLast) property).value));
+    }
+
+
+    /**
+     * Get this property in the style.
+     *
+     * @param style   The style where the property is
+     * @param resolve if true, resolve the style to find this property
+     */
+    public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
+        if (resolve) {
+            return ((Css3Style) style).getHyphenateLimitLast();
+        } else {
+            return ((Css3Style) style).cssHyphenateLimitLast;
+        }
+    }
+}
+
diff --git a/org/w3c/css/properties/css/CssHyphenateLimitLines.java b/org/w3c/css/properties/css/CssHyphenateLimitLines.java
new file mode 100644
index 000000000..42fc22bb2
--- /dev/null
+++ b/org/w3c/css/properties/css/CssHyphenateLimitLines.java
@@ -0,0 +1,112 @@
+//
+// Author: Yves Lafon 
+//
+// (c) COPYRIGHT MIT, ERCIM, Keio, Beihang, 2022.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.properties.css;
+
+import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css3.Css3Style;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+
+/**
+ * @since CSS3
+ */
+public class CssHyphenateLimitLines extends CssProperty {
+
+    /**
+     * Create a new CssHyphenateLimitLines
+     */
+    public CssHyphenateLimitLines() {
+    }
+
+    /**
+     * Creates a new CssHyphenateLimitLines
+     *
+     * @param expression The expression for this property
+     * @throws InvalidParamException Expressions are incorrect
+     */
+    public CssHyphenateLimitLines(ApplContext ac, CssExpression expression, boolean check)
+            throws InvalidParamException {
+        throw new InvalidParamException("value",
+                expression.getValue().toString(),
+                getPropertyName(), ac);
+    }
+
+    public CssHyphenateLimitLines(ApplContext ac, CssExpression expression)
+            throws InvalidParamException {
+        this(ac, expression, false);
+    }
+
+    /**
+     * Returns the value of this property
+     */
+    public Object get() {
+        return value;
+    }
+
+
+    /**
+     * Returns the name of this property
+     */
+    public final String getPropertyName() {
+        return "hyphenate-limit-lines";
+    }
+
+    /**
+     * Returns true if this property is "softly" inherited
+     * e.g. his value is equals to inherit
+     */
+    public boolean isSoftlyInherited() {
+        return value.equals(inherit);
+    }
+
+    /**
+     * Returns a string representation of the object.
+     */
+    public String toString() {
+        return value.toString();
+    }
+
+    /**
+     * Add this property to the CssStyle.
+     *
+     * @param style The CssStyle
+     */
+    public void addToStyle(ApplContext ac, CssStyle style) {
+        Css3Style s = (Css3Style) style;
+        if (s.cssHyphenateLimitLines != null) {
+            style.addRedefinitionWarning(ac, this);
+        }
+        s.cssHyphenateLimitLines = this;
+    }
+
+
+    /**
+     * Compares two properties for equality.
+     *
+     * @param property The other property.
+     */
+    public boolean equals(CssProperty property) {
+        return (property instanceof CssHyphenateLimitLines &&
+                value.equals(((CssHyphenateLimitLines) property).value));
+    }
+
+
+    /**
+     * Get this property in the style.
+     *
+     * @param style   The style where the property is
+     * @param resolve if true, resolve the style to find this property
+     */
+    public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
+        if (resolve) {
+            return ((Css3Style) style).getHyphenateLimitLines();
+        } else {
+            return ((Css3Style) style).cssHyphenateLimitLines;
+        }
+    }
+}
+
diff --git a/org/w3c/css/properties/css/CssHyphenateLimitZone.java b/org/w3c/css/properties/css/CssHyphenateLimitZone.java
new file mode 100644
index 000000000..96a7afa06
--- /dev/null
+++ b/org/w3c/css/properties/css/CssHyphenateLimitZone.java
@@ -0,0 +1,112 @@
+//
+// Author: Yves Lafon 
+//
+// (c) COPYRIGHT MIT, ERCIM, Keio, Beihang, 2022.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.properties.css;
+
+import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css3.Css3Style;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+
+/**
+ * @since CSS3
+ */
+public class CssHyphenateLimitZone extends CssProperty {
+
+    /**
+     * Create a new CssHyphenateLimitZone
+     */
+    public CssHyphenateLimitZone() {
+    }
+
+    /**
+     * Creates a new CssHyphenateLimitZone
+     *
+     * @param expression The expression for this property
+     * @throws InvalidParamException Expressions are incorrect
+     */
+    public CssHyphenateLimitZone(ApplContext ac, CssExpression expression, boolean check)
+            throws InvalidParamException {
+        throw new InvalidParamException("value",
+                expression.getValue().toString(),
+                getPropertyName(), ac);
+    }
+
+    public CssHyphenateLimitZone(ApplContext ac, CssExpression expression)
+            throws InvalidParamException {
+        this(ac, expression, false);
+    }
+
+    /**
+     * Returns the value of this property
+     */
+    public Object get() {
+        return value;
+    }
+
+
+    /**
+     * Returns the name of this property
+     */
+    public final String getPropertyName() {
+        return "hyphenate-limit-zone";
+    }
+
+    /**
+     * Returns true if this property is "softly" inherited
+     * e.g. his value is equals to inherit
+     */
+    public boolean isSoftlyInherited() {
+        return value.equals(inherit);
+    }
+
+    /**
+     * Returns a string representation of the object.
+     */
+    public String toString() {
+        return value.toString();
+    }
+
+    /**
+     * Add this property to the CssStyle.
+     *
+     * @param style The CssStyle
+     */
+    public void addToStyle(ApplContext ac, CssStyle style) {
+        Css3Style s = (Css3Style) style;
+        if (s.cssHyphenateLimitZone != null) {
+            style.addRedefinitionWarning(ac, this);
+        }
+        s.cssHyphenateLimitZone = this;
+    }
+
+
+    /**
+     * Compares two properties for equality.
+     *
+     * @param property The other property.
+     */
+    public boolean equals(CssProperty property) {
+        return (property instanceof CssHyphenateLimitZone &&
+                value.equals(((CssHyphenateLimitZone) property).value));
+    }
+
+
+    /**
+     * Get this property in the style.
+     *
+     * @param style   The style where the property is
+     * @param resolve if true, resolve the style to find this property
+     */
+    public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
+        if (resolve) {
+            return ((Css3Style) style).getHyphenateLimitZone();
+        } else {
+            return ((Css3Style) style).cssHyphenateLimitZone;
+        }
+    }
+}
+
diff --git a/org/w3c/css/properties/css/CssImageRendering.java b/org/w3c/css/properties/css/CssImageRendering.java
index 489ba4340..5a6b87b52 100644
--- a/org/w3c/css/properties/css/CssImageRendering.java
+++ b/org/w3c/css/properties/css/CssImageRendering.java
@@ -6,7 +6,7 @@
 package org.w3c.css.properties.css;
 
 import org.w3c.css.parser.CssStyle;
-import org.w3c.css.properties.svg.SVGBasicStyle;
+import org.w3c.css.properties.css3.Css3Style;
 import org.w3c.css.util.ApplContext;
 import org.w3c.css.util.InvalidParamException;
 import org.w3c.css.values.CssExpression;
@@ -78,7 +78,7 @@ public String toString() {
      * @param style The CssStyle
      */
     public void addToStyle(ApplContext ac, CssStyle style) {
-        SVGBasicStyle s = (SVGBasicStyle) style;
+        Css3Style s = (Css3Style) style;
         if (s.cssImageRendering != null) {
             style.addRedefinitionWarning(ac, this);
         }
@@ -105,9 +105,9 @@ public boolean equals(CssProperty property) {
      */
     public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
         if (resolve) {
-            return ((SVGBasicStyle) style).getImageRendering();
+            return ((Css3Style) style).getImageRendering();
         } else {
-            return ((SVGBasicStyle) style).cssImageRendering;
+            return ((Css3Style) style).cssImageRendering;
         }
     }
 }
diff --git a/org/w3c/css/properties/css/CssLinePadding.java b/org/w3c/css/properties/css/CssLinePadding.java
new file mode 100644
index 000000000..cac7b65c1
--- /dev/null
+++ b/org/w3c/css/properties/css/CssLinePadding.java
@@ -0,0 +1,112 @@
+//
+// Author: Yves Lafon 
+//
+// (c) COPYRIGHT World Wide Web Consortium, 2024.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.properties.css;
+
+import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css3.Css3Style;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+
+/**
+ * @since CSS3
+ */
+public class CssLinePadding extends CssProperty {
+
+    /**
+     * Create a new CssLinePadding
+     */
+    public CssLinePadding() {
+    }
+
+    /**
+     * Creates a new CssLinePadding
+     *
+     * @param expression The expression for this property
+     * @throws InvalidParamException Expressions are incorrect
+     */
+    public CssLinePadding(ApplContext ac, CssExpression expression, boolean check)
+            throws InvalidParamException {
+        throw new InvalidParamException("value",
+                expression.getValue().toString(),
+                getPropertyName(), ac);
+    }
+
+    public CssLinePadding(ApplContext ac, CssExpression expression)
+            throws InvalidParamException {
+        this(ac, expression, false);
+    }
+
+    /**
+     * Returns the value of this property
+     */
+    public Object get() {
+        return value;
+    }
+
+
+    /**
+     * Returns the name of this property
+     */
+    public final String getPropertyName() {
+        return "line-padding";
+    }
+
+    /**
+     * Returns true if this property is "softly" inherited
+     * e.g. his value is equals to inherit
+     */
+    public boolean isSoftlyInherited() {
+        return value.equals(inherit);
+    }
+
+    /**
+     * Returns a string representation of the object.
+     */
+    public String toString() {
+        return value.toString();
+    }
+
+    /**
+     * Add this property to the CssStyle.
+     *
+     * @param style The CssStyle
+     */
+    public void addToStyle(ApplContext ac, CssStyle style) {
+        Css3Style s = (Css3Style) style;
+        if (s.cssLinePadding != null) {
+            style.addRedefinitionWarning(ac, this);
+        }
+        s.cssLinePadding = this;
+    }
+
+
+    /**
+     * Compares two properties for equality.
+     *
+     * @param property The other property.
+     */
+    public boolean equals(CssProperty property) {
+        return (property instanceof CssLinePadding &&
+                value.equals(((CssLinePadding) property).value));
+    }
+
+
+    /**
+     * Get this property in the style.
+     *
+     * @param style   The style where the property is
+     * @param resolve if true, resolve the style to find this property
+     */
+    public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
+        if (resolve) {
+            return ((Css3Style) style).getLinePadding();
+        } else {
+            return ((Css3Style) style).cssLinePadding;
+        }
+    }
+}
+
diff --git a/org/w3c/css/properties/css/CssOverscrollBehavior.java b/org/w3c/css/properties/css/CssOverscrollBehavior.java
new file mode 100644
index 000000000..59d21c74b
--- /dev/null
+++ b/org/w3c/css/properties/css/CssOverscrollBehavior.java
@@ -0,0 +1,110 @@
+// $Id$
+// Author: Yves Lafon 
+//
+// (c) COPYRIGHT MIT, ERCIM and Keio University, 2012.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.properties.css;
+
+import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css3.Css3Style;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+
+/**
+ * @since CSS2
+ */
+public class CssOverscrollBehavior extends CssProperty {
+
+
+    /**
+     * Create a new CssOverscrollBehavior
+     */
+    public CssOverscrollBehavior() {
+    }
+
+    /**
+     * Creates a new CssOverscrollBehavior
+     *
+     * @param expression The expression for this property
+     * @throws InvalidParamException Expressions are incorrect
+     */
+    public CssOverscrollBehavior(ApplContext ac, CssExpression expression, boolean check)
+            throws InvalidParamException {
+        throw new InvalidParamException("value",
+                expression.getValue().toString(),
+                getPropertyName(), ac);
+    }
+
+    public CssOverscrollBehavior(ApplContext ac, CssExpression expression)
+            throws InvalidParamException {
+        this(ac, expression, false);
+    }
+
+    /**
+     * Returns the value of this property
+     */
+    public Object get() {
+        return value;
+    }
+
+
+    /**
+     * Returns the name of this property
+     */
+    public final String getPropertyName() {
+        return "overscroll-behavior";
+    }
+
+    /**
+     * Returns true if this property is "softly" inherited
+     * e.g. his value is equals to inherit
+     */
+    public boolean isSoftlyInherited() {
+        return inherit.equals(value);
+    }
+
+    /**
+     * Returns a string representation of the object.
+     */
+    public String toString() {
+        return value.toString();
+    }
+
+    /**
+     * Add this property to the CssStyle.
+     *
+     * @param style The CssStyle
+     */
+    public void addToStyle(ApplContext ac, CssStyle style) {
+        if (((Css3Style) style).cssOverscrollBehavior != null)
+            style.addRedefinitionWarning(ac, this);
+        ((Css3Style) style).cssOverscrollBehavior = this;
+    }
+
+    /**
+     * Compares two properties for equality.
+     *
+     * @param property The other property.
+     */
+    public boolean equals(CssProperty property) {
+        return (property instanceof CssOverscrollBehavior &&
+                value.equals(((CssOverscrollBehavior) property).value));
+    }
+
+
+    /**
+     * Get this property in the style.
+     *
+     * @param style   The style where the property is
+     * @param resolve if true, resolve the style to find this property
+     */
+    public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
+        if (resolve) {
+            return ((Css3Style) style).getOverscrollBehavior();
+        } else {
+            return ((Css3Style) style).cssOverscrollBehavior;
+        }
+    }
+}
+
diff --git a/org/w3c/css/properties/css/CssOverscrollBehaviorBlock.java b/org/w3c/css/properties/css/CssOverscrollBehaviorBlock.java
new file mode 100644
index 000000000..6d86faf23
--- /dev/null
+++ b/org/w3c/css/properties/css/CssOverscrollBehaviorBlock.java
@@ -0,0 +1,110 @@
+// $Id$
+// Author: Yves Lafon 
+//
+// (c) COPYRIGHT MIT, ERCIM and Keio University, 2012.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.properties.css;
+
+import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css3.Css3Style;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+
+/**
+ * @since CSS3
+ */
+public class CssOverscrollBehaviorBlock extends CssProperty {
+
+    /**
+     * Create a new CssOverscrollBehaviorBlock
+     */
+    public CssOverscrollBehaviorBlock() {
+    }
+
+    /**
+     * Creates a new CssOverscrollBehaviorBlock
+     *
+     * @param expression The expression for this property
+     * @throws InvalidParamException
+     *          Expressions are incorrect
+     */
+    public CssOverscrollBehaviorBlock(ApplContext ac, CssExpression expression, boolean check)
+            throws InvalidParamException {
+        throw new InvalidParamException("value",
+                expression.getValue().toString(),
+                getPropertyName(), ac);
+    }
+
+    public CssOverscrollBehaviorBlock(ApplContext ac, CssExpression expression)
+            throws InvalidParamException {
+        this(ac, expression, false);
+    }
+
+    /**
+     * Returns the value of this property
+     */
+    public Object get() {
+        return value;
+    }
+
+
+    /**
+     * Returns the name of this property
+     */
+    public final String getPropertyName() {
+        return "overscroll-behavior-block";
+    }
+
+    /**
+     * Returns true if this property is "softly" inherited
+     * e.g. his value is equals to inherit
+     */
+    public boolean isSoftlyInherited() {
+        return inherit.equals(value);
+    }
+
+    /**
+     * Returns a string representation of the object.
+     */
+    public String toString() {
+        return value.toString();
+    }
+
+    /**
+     * Add this property to the CssStyle.
+     *
+     * @param style The CssStyle
+     */
+    public void addToStyle(ApplContext ac, CssStyle style) {
+        if (((Css3Style) style).cssOverscrollBehaviorBlock != null)
+            style.addRedefinitionWarning(ac, this);
+        ((Css3Style) style).cssOverscrollBehaviorBlock = this;
+    }
+
+    /**
+     * Compares two properties for equality.
+     *
+     * @param property The other property.
+     */
+    public boolean equals(CssProperty property) {
+        return (property instanceof CssOverscrollBehaviorBlock &&
+                value.equals(((CssOverscrollBehaviorBlock) property).value));
+    }
+
+
+    /**
+     * Get this property in the style.
+     *
+     * @param style   The style where the property is
+     * @param resolve if true, resolve the style to find this property
+     */
+    public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
+        if (resolve) {
+            return ((Css3Style) style).getOverscrollBehaviorBlock();
+        } else {
+            return ((Css3Style) style).cssOverscrollBehaviorBlock;
+        }
+    }
+}
+
diff --git a/org/w3c/css/properties/css/CssOverscrollBehaviorInline.java b/org/w3c/css/properties/css/CssOverscrollBehaviorInline.java
new file mode 100644
index 000000000..17fbddf6c
--- /dev/null
+++ b/org/w3c/css/properties/css/CssOverscrollBehaviorInline.java
@@ -0,0 +1,110 @@
+// $Id$
+// Author: Yves Lafon 
+//
+// (c) COPYRIGHT MIT, ERCIM and Keio University, 2012.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.properties.css;
+
+import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css3.Css3Style;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+
+/**
+ * @since CSS3
+ */
+public class CssOverscrollBehaviorInline extends CssProperty {
+
+    /**
+     * Create a new CssOverscrollBehaviorInline
+     */
+    public CssOverscrollBehaviorInline() {
+    }
+
+    /**
+     * Creates a new CssOverscrollBehaviorInline
+     *
+     * @param expression The expression for this property
+     * @throws InvalidParamException
+     *          Expressions are incorrect
+     */
+    public CssOverscrollBehaviorInline(ApplContext ac, CssExpression expression, boolean check)
+            throws InvalidParamException {
+        throw new InvalidParamException("value",
+                expression.getValue().toString(),
+                getPropertyName(), ac);
+    }
+
+    public CssOverscrollBehaviorInline(ApplContext ac, CssExpression expression)
+            throws InvalidParamException {
+        this(ac, expression, false);
+    }
+
+    /**
+     * Returns the value of this property
+     */
+    public Object get() {
+        return value;
+    }
+
+
+    /**
+     * Returns the name of this property
+     */
+    public final String getPropertyName() {
+        return "overscroll-behavior-inline";
+    }
+
+    /**
+     * Returns true if this property is "softly" inherited
+     * e.g. his value is equals to inherit
+     */
+    public boolean isSoftlyInherited() {
+        return inherit.equals(value);
+    }
+
+    /**
+     * Returns a string representation of the object.
+     */
+    public String toString() {
+        return value.toString();
+    }
+
+    /**
+     * Add this property to the CssStyle.
+     *
+     * @param style The CssStyle
+     */
+    public void addToStyle(ApplContext ac, CssStyle style) {
+        if (((Css3Style) style).cssOverscrollBehaviorInline != null)
+            style.addRedefinitionWarning(ac, this);
+        ((Css3Style) style).cssOverscrollBehaviorInline = this;
+    }
+
+    /**
+     * Compares two properties for equality.
+     *
+     * @param property The other property.
+     */
+    public boolean equals(CssProperty property) {
+        return (property instanceof CssOverscrollBehaviorInline &&
+                value.equals(((CssOverscrollBehaviorInline) property).value));
+    }
+
+
+    /**
+     * Get this property in the style.
+     *
+     * @param style   The style where the property is
+     * @param resolve if true, resolve the style to find this property
+     */
+    public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
+        if (resolve) {
+            return ((Css3Style) style).getOverscrollBehaviorInline();
+        } else {
+            return ((Css3Style) style).cssOverscrollBehaviorInline;
+        }
+    }
+}
+
diff --git a/org/w3c/css/properties/css/CssOverscrollBehaviorX.java b/org/w3c/css/properties/css/CssOverscrollBehaviorX.java
new file mode 100644
index 000000000..2c0a9fb92
--- /dev/null
+++ b/org/w3c/css/properties/css/CssOverscrollBehaviorX.java
@@ -0,0 +1,110 @@
+// $Id$
+// Author: Yves Lafon 
+//
+// (c) COPYRIGHT MIT, ERCIM and Keio University, 2012.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.properties.css;
+
+import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css3.Css3Style;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+
+/**
+ * @since CSS3
+ */
+public class CssOverscrollBehaviorX extends CssProperty {
+
+    /**
+     * Create a new CssOverscrollBehaviorX
+     */
+    public CssOverscrollBehaviorX() {
+    }
+
+    /**
+     * Creates a new CssOverscrollBehaviorX
+     *
+     * @param expression The expression for this property
+     * @throws InvalidParamException
+     *          Expressions are incorrect
+     */
+    public CssOverscrollBehaviorX(ApplContext ac, CssExpression expression, boolean check)
+            throws InvalidParamException {
+        throw new InvalidParamException("value",
+                expression.getValue().toString(),
+                getPropertyName(), ac);
+    }
+
+    public CssOverscrollBehaviorX(ApplContext ac, CssExpression expression)
+            throws InvalidParamException {
+        this(ac, expression, false);
+    }
+
+    /**
+     * Returns the value of this property
+     */
+    public Object get() {
+        return value;
+    }
+
+
+    /**
+     * Returns the name of this property
+     */
+    public final String getPropertyName() {
+        return "overscroll-behavior-x";
+    }
+
+    /**
+     * Returns true if this property is "softly" inherited
+     * e.g. his value is equals to inherit
+     */
+    public boolean isSoftlyInherited() {
+        return inherit.equals(value);
+    }
+
+    /**
+     * Returns a string representation of the object.
+     */
+    public String toString() {
+        return value.toString();
+    }
+
+    /**
+     * Add this property to the CssStyle.
+     *
+     * @param style The CssStyle
+     */
+    public void addToStyle(ApplContext ac, CssStyle style) {
+        if (((Css3Style) style).cssOverscrollBehaviorX != null)
+            style.addRedefinitionWarning(ac, this);
+        ((Css3Style) style).cssOverscrollBehaviorX = this;
+    }
+
+    /**
+     * Compares two properties for equality.
+     *
+     * @param property The other property.
+     */
+    public boolean equals(CssProperty property) {
+        return (property instanceof CssOverscrollBehaviorX &&
+                value.equals(((CssOverscrollBehaviorX) property).value));
+    }
+
+
+    /**
+     * Get this property in the style.
+     *
+     * @param style   The style where the property is
+     * @param resolve if true, resolve the style to find this property
+     */
+    public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
+        if (resolve) {
+            return ((Css3Style) style).getOverscrollBehaviorX();
+        } else {
+            return ((Css3Style) style).cssOverscrollBehaviorX;
+        }
+    }
+}
+
diff --git a/org/w3c/css/properties/css/CssOverscrollBehaviorY.java b/org/w3c/css/properties/css/CssOverscrollBehaviorY.java
new file mode 100644
index 000000000..132d55a81
--- /dev/null
+++ b/org/w3c/css/properties/css/CssOverscrollBehaviorY.java
@@ -0,0 +1,110 @@
+// $Id$
+// Author: Yves Lafon 
+//
+// (c) COPYRIGHT MIT, ERCIM and Keio University, 2012.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.properties.css;
+
+import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css3.Css3Style;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+
+/**
+ * @since CSS3
+ */
+public class CssOverscrollBehaviorY extends CssProperty {
+
+    /**
+     * Create a new CssOverscrollBehaviorY
+     */
+    public CssOverscrollBehaviorY() {
+    }
+
+    /**
+     * Creates a new CssOverscrollBehaviorY
+     *
+     * @param expression The expression for this property
+     * @throws InvalidParamException
+     *          Expressions are incorrect
+     */
+    public CssOverscrollBehaviorY(ApplContext ac, CssExpression expression, boolean check)
+            throws InvalidParamException {
+        throw new InvalidParamException("value",
+                expression.getValue().toString(),
+                getPropertyName(), ac);
+    }
+
+    public CssOverscrollBehaviorY(ApplContext ac, CssExpression expression)
+            throws InvalidParamException {
+        this(ac, expression, false);
+    }
+
+    /**
+     * Returns the value of this property
+     */
+    public Object get() {
+        return value;
+    }
+
+
+    /**
+     * Returns the name of this property
+     */
+    public final String getPropertyName() {
+        return "overscroll-behavior-y";
+    }
+
+    /**
+     * Returns true if this property is "softly" inherited
+     * e.g. his value is equals to inherit
+     */
+    public boolean isSoftlyInherited() {
+        return inherit.equals(value);
+    }
+
+    /**
+     * Returns a string representation of the object.
+     */
+    public String toString() {
+        return value.toString();
+    }
+
+    /**
+     * Add this property to the CssStyle.
+     *
+     * @param style The CssStyle
+     */
+    public void addToStyle(ApplContext ac, CssStyle style) {
+        if (((Css3Style) style).cssOverscrollBehaviorY != null)
+            style.addRedefinitionWarning(ac, this);
+        ((Css3Style) style).cssOverscrollBehaviorY = this;
+    }
+
+    /**
+     * Compares two properties for equality.
+     *
+     * @param property The other property.
+     */
+    public boolean equals(CssProperty property) {
+        return (property instanceof CssOverscrollBehaviorY &&
+                value.equals(((CssOverscrollBehaviorY) property).value));
+    }
+
+
+    /**
+     * Get this property in the style.
+     *
+     * @param style   The style where the property is
+     * @param resolve if true, resolve the style to find this property
+     */
+    public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
+        if (resolve) {
+            return ((Css3Style) style).getOverscrollBehaviorY();
+        } else {
+            return ((Css3Style) style).cssOverscrollBehaviorY;
+        }
+    }
+}
+
diff --git a/org/w3c/css/properties/css/CssRotate.java b/org/w3c/css/properties/css/CssRotate.java
new file mode 100644
index 000000000..7ee89d9f8
--- /dev/null
+++ b/org/w3c/css/properties/css/CssRotate.java
@@ -0,0 +1,113 @@
+//
+// Author: Yves Lafon 
+//
+// (c) COPYRIGHT World Wide Web Consortium, 2025.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.properties.css;
+
+import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css3.Css3Style;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+
+/**
+ * @since CSS3
+ */
+public class CssRotate extends CssProperty {
+
+    /**
+     * Create a new CssRotate
+     */
+    public CssRotate() {
+    }
+
+    /**
+     * Creates a new CssRotate
+     *
+     * @param expression The expression for this property
+     * @throws InvalidParamException
+     *          Expressions are incorrect
+     */
+    public CssRotate(ApplContext ac, CssExpression expression, boolean check)
+            throws InvalidParamException {
+        throw new InvalidParamException("value",
+                expression.getValue().toString(),
+                getPropertyName(), ac);
+    }
+
+    public CssRotate(ApplContext ac, CssExpression expression)
+            throws InvalidParamException {
+        this(ac, expression, false);
+    }
+
+    /**
+     * Returns the value of this property
+     */
+    public Object get() {
+        return value;
+    }
+
+
+    /**
+     * Returns the name of this property
+     */
+    public final String getPropertyName() {
+        return "rotate";
+    }
+
+    /**
+     * Returns true if this property is "softly" inherited
+     * e.g. his value is equals to inherit
+     */
+    public boolean isSoftlyInherited() {
+        return value.equals(inherit);
+    }
+
+    /**
+     * Returns a string representation of the object.
+     */
+    public String toString() {
+        return value.toString();
+    }
+
+    /**
+     * Add this property to the CssStyle.
+     *
+     * @param style The CssStyle
+     */
+    public void addToStyle(ApplContext ac, CssStyle style) {
+        Css3Style s = (Css3Style) style;
+        if (s.cssRotate != null) {
+            style.addRedefinitionWarning(ac, this);
+        }
+        s.cssRotate = this;
+    }
+
+
+    /**
+     * Compares two properties for equality.
+     *
+     * @param property The other property.
+     */
+    public boolean equals(CssProperty property) {
+        return (property instanceof CssRotate &&
+                value.equals(((CssRotate) property).value));
+    }
+
+
+    /**
+     * Get this property in the style.
+     *
+     * @param style   The style where the property is
+     * @param resolve if true, resolve the style to find this property
+     */
+    public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
+        if (resolve) {
+            return ((Css3Style) style).getRotate();
+        } else {
+            return ((Css3Style) style).cssRotate;
+        }
+    }
+}
+
diff --git a/org/w3c/css/properties/css/CssScale.java b/org/w3c/css/properties/css/CssScale.java
new file mode 100644
index 000000000..cdf857993
--- /dev/null
+++ b/org/w3c/css/properties/css/CssScale.java
@@ -0,0 +1,113 @@
+//
+// Author: Yves Lafon 
+//
+// (c) COPYRIGHT World Wide Web Consortium, 2025.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.properties.css;
+
+import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css3.Css3Style;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+
+/**
+ * @since CSS3
+ */
+public class CssScale extends CssProperty {
+
+    /**
+     * Create a new CssScale
+     */
+    public CssScale() {
+    }
+
+    /**
+     * Creates a new CssScale
+     *
+     * @param expression The expression for this property
+     * @throws InvalidParamException
+     *          Expressions are incorrect
+     */
+    public CssScale(ApplContext ac, CssExpression expression, boolean check)
+            throws InvalidParamException {
+        throw new InvalidParamException("value",
+                expression.getValue().toString(),
+                getPropertyName(), ac);
+    }
+
+    public CssScale(ApplContext ac, CssExpression expression)
+            throws InvalidParamException {
+        this(ac, expression, false);
+    }
+
+    /**
+     * Returns the value of this property
+     */
+    public Object get() {
+        return value;
+    }
+
+
+    /**
+     * Returns the name of this property
+     */
+    public final String getPropertyName() {
+        return "scale";
+    }
+
+    /**
+     * Returns true if this property is "softly" inherited
+     * e.g. his value is equals to inherit
+     */
+    public boolean isSoftlyInherited() {
+        return value.equals(inherit);
+    }
+
+    /**
+     * Returns a string representation of the object.
+     */
+    public String toString() {
+        return value.toString();
+    }
+
+    /**
+     * Add this property to the CssStyle.
+     *
+     * @param style The CssStyle
+     */
+    public void addToStyle(ApplContext ac, CssStyle style) {
+        Css3Style s = (Css3Style) style;
+        if (s.cssScale != null) {
+            style.addRedefinitionWarning(ac, this);
+        }
+        s.cssScale = this;
+    }
+
+
+    /**
+     * Compares two properties for equality.
+     *
+     * @param property The other property.
+     */
+    public boolean equals(CssProperty property) {
+        return (property instanceof CssScale &&
+                value.equals(((CssScale) property).value));
+    }
+
+
+    /**
+     * Get this property in the style.
+     *
+     * @param style   The style where the property is
+     * @param resolve if true, resolve the style to find this property
+     */
+    public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
+        if (resolve) {
+            return ((Css3Style) style).getScale();
+        } else {
+            return ((Css3Style) style).cssScale;
+        }
+    }
+}
+
diff --git a/org/w3c/css/properties/css/CssTextAutospace.java b/org/w3c/css/properties/css/CssTextAutospace.java
new file mode 100644
index 000000000..01f7ab2d9
--- /dev/null
+++ b/org/w3c/css/properties/css/CssTextAutospace.java
@@ -0,0 +1,112 @@
+//
+// Author: Yves Lafon 
+//
+// (c) COPYRIGHT World Wide Web Consortium, 2024.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.properties.css;
+
+import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css3.Css3Style;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+
+/**
+ * @since CSS3
+ */
+public class CssTextAutospace extends CssProperty {
+
+    /**
+     * Create a new CssTextAutospace
+     */
+    public CssTextAutospace() {
+    }
+
+    /**
+     * Creates a new CssTextAutospace
+     *
+     * @param expression The expression for this property
+     * @throws InvalidParamException Expressions are incorrect
+     */
+    public CssTextAutospace(ApplContext ac, CssExpression expression, boolean check)
+            throws InvalidParamException {
+        throw new InvalidParamException("value",
+                expression.getValue().toString(),
+                getPropertyName(), ac);
+    }
+
+    public CssTextAutospace(ApplContext ac, CssExpression expression)
+            throws InvalidParamException {
+        this(ac, expression, false);
+    }
+
+    /**
+     * Returns the value of this property
+     */
+    public Object get() {
+        return value;
+    }
+
+
+    /**
+     * Returns the name of this property
+     */
+    public final String getPropertyName() {
+        return "text-autospace";
+    }
+
+    /**
+     * Returns true if this property is "softly" inherited
+     * e.g. his value is equals to inherit
+     */
+    public boolean isSoftlyInherited() {
+        return value.equals(inherit);
+    }
+
+    /**
+     * Returns a string representation of the object.
+     */
+    public String toString() {
+        return value.toString();
+    }
+
+    /**
+     * Add this property to the CssStyle.
+     *
+     * @param style The CssStyle
+     */
+    public void addToStyle(ApplContext ac, CssStyle style) {
+        Css3Style s = (Css3Style) style;
+        if (s.cssTextAutospace != null) {
+            style.addRedefinitionWarning(ac, this);
+        }
+        s.cssTextAutospace = this;
+    }
+
+
+    /**
+     * Compares two properties for equality.
+     *
+     * @param property The other property.
+     */
+    public boolean equals(CssProperty property) {
+        return (property instanceof CssTextAutospace &&
+                value.equals(((CssTextAutospace) property).value));
+    }
+
+
+    /**
+     * Get this property in the style.
+     *
+     * @param style   The style where the property is
+     * @param resolve if true, resolve the style to find this property
+     */
+    public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
+        if (resolve) {
+            return ((Css3Style) style).getTextAutospace();
+        } else {
+            return ((Css3Style) style).cssTextAutospace;
+        }
+    }
+}
+
diff --git a/org/w3c/css/properties/css/CssTextGroupAlign.java b/org/w3c/css/properties/css/CssTextGroupAlign.java
new file mode 100644
index 000000000..51042675f
--- /dev/null
+++ b/org/w3c/css/properties/css/CssTextGroupAlign.java
@@ -0,0 +1,112 @@
+//
+// Author: Yves Lafon 
+//
+// (c) COPYRIGHT MIT, ERCIM, Keio, Beihang, 2022.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.properties.css;
+
+import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css3.Css3Style;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+
+/**
+ * @since CSS3
+ */
+public class CssTextGroupAlign extends CssProperty {
+
+    /**
+     * Create a new CssTextGroupAlign
+     */
+    public CssTextGroupAlign() {
+    }
+
+    /**
+     * Creates a new CssTextgroupAlign
+     *
+     * @param expression The expression for this property
+     * @throws InvalidParamException Expressions are incorrect
+     */
+    public CssTextGroupAlign(ApplContext ac, CssExpression expression, boolean check)
+            throws InvalidParamException {
+        throw new InvalidParamException("value",
+                expression.getValue().toString(),
+                getPropertyName(), ac);
+    }
+
+    public CssTextGroupAlign(ApplContext ac, CssExpression expression)
+            throws InvalidParamException {
+        this(ac, expression, false);
+    }
+
+    /**
+     * Returns the value of this property
+     */
+    public Object get() {
+        return value;
+    }
+
+
+    /**
+     * Returns the name of this property
+     */
+    public final String getPropertyName() {
+        return "text-group-align";
+    }
+
+    /**
+     * Returns true if this property is "softly" inherited
+     * e.g. his value is equals to inherit
+     */
+    public boolean isSoftlyInherited() {
+        return value.equals(inherit);
+    }
+
+    /**
+     * Returns a string representation of the object.
+     */
+    public String toString() {
+        return value.toString();
+    }
+
+    /**
+     * Add this property to the CssStyle.
+     *
+     * @param style The CssStyle
+     */
+    public void addToStyle(ApplContext ac, CssStyle style) {
+        Css3Style s = (Css3Style) style;
+        if (s.cssTextGroupAlign != null) {
+            style.addRedefinitionWarning(ac, this);
+        }
+        s.cssTextGroupAlign = this;
+    }
+
+
+    /**
+     * Compares two properties for equality.
+     *
+     * @param property The other property.
+     */
+    public boolean equals(CssProperty property) {
+        return (property instanceof CssTextGroupAlign &&
+                value.equals(((CssTextGroupAlign) property).value));
+    }
+
+
+    /**
+     * Get this property in the style.
+     *
+     * @param style   The style where the property is
+     * @param resolve if true, resolve the style to find this property
+     */
+    public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
+        if (resolve) {
+            return ((Css3Style) style).getTextGroupAlign();
+        } else {
+            return ((Css3Style) style).cssTextGroupAlign;
+        }
+    }
+}
+
diff --git a/org/w3c/css/properties/css/CssTextSpacing.java b/org/w3c/css/properties/css/CssTextSpacing.java
new file mode 100644
index 000000000..1dfe4869d
--- /dev/null
+++ b/org/w3c/css/properties/css/CssTextSpacing.java
@@ -0,0 +1,112 @@
+//
+// Author: Yves Lafon 
+//
+// (c) COPYRIGHT World Wide Web Consortium, 2024.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.properties.css;
+
+import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css3.Css3Style;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+
+/**
+ * @since CSS3
+ */
+public class CssTextSpacing extends CssProperty {
+
+    /**
+     * Create a new CssTextSpacing
+     */
+    public CssTextSpacing() {
+    }
+
+    /**
+     * Creates a new CssTextSpacing
+     *
+     * @param expression The expression for this property
+     * @throws InvalidParamException Expressions are incorrect
+     */
+    public CssTextSpacing(ApplContext ac, CssExpression expression, boolean check)
+            throws InvalidParamException {
+        throw new InvalidParamException("value",
+                expression.getValue().toString(),
+                getPropertyName(), ac);
+    }
+
+    public CssTextSpacing(ApplContext ac, CssExpression expression)
+            throws InvalidParamException {
+        this(ac, expression, false);
+    }
+
+    /**
+     * Returns the value of this property
+     */
+    public Object get() {
+        return value;
+    }
+
+
+    /**
+     * Returns the name of this property
+     */
+    public final String getPropertyName() {
+        return "text-spacing";
+    }
+
+    /**
+     * Returns true if this property is "softly" inherited
+     * e.g. his value is equals to inherit
+     */
+    public boolean isSoftlyInherited() {
+        return value.equals(inherit);
+    }
+
+    /**
+     * Returns a string representation of the object.
+     */
+    public String toString() {
+        return value.toString();
+    }
+
+    /**
+     * Add this property to the CssStyle.
+     *
+     * @param style The CssStyle
+     */
+    public void addToStyle(ApplContext ac, CssStyle style) {
+        Css3Style s = (Css3Style) style;
+        if (s.cssTextSpacing != null) {
+            style.addRedefinitionWarning(ac, this);
+        }
+        s.cssTextSpacing = this;
+    }
+
+
+    /**
+     * Compares two properties for equality.
+     *
+     * @param property The other property.
+     */
+    public boolean equals(CssProperty property) {
+        return (property instanceof CssTextSpacing &&
+                value.equals(((CssTextSpacing) property).value));
+    }
+
+
+    /**
+     * Get this property in the style.
+     *
+     * @param style   The style where the property is
+     * @param resolve if true, resolve the style to find this property
+     */
+    public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
+        if (resolve) {
+            return ((Css3Style) style).getTextSpacing();
+        } else {
+            return ((Css3Style) style).cssTextSpacing;
+        }
+    }
+}
+
diff --git a/org/w3c/css/properties/css/CssTextSpacingTrim.java b/org/w3c/css/properties/css/CssTextSpacingTrim.java
new file mode 100644
index 000000000..3184adf34
--- /dev/null
+++ b/org/w3c/css/properties/css/CssTextSpacingTrim.java
@@ -0,0 +1,112 @@
+//
+// Author: Yves Lafon 
+//
+// (c) COPYRIGHT World Wide Web Consortium, 2024.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.properties.css;
+
+import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css3.Css3Style;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+
+/**
+ * @since CSS3
+ */
+public class CssTextSpacingTrim extends CssProperty {
+
+    /**
+     * Create a new CssTextSpacingTrim
+     */
+    public CssTextSpacingTrim() {
+    }
+
+    /**
+     * Creates a new CssTextSpacingTrim
+     *
+     * @param expression The expression for this property
+     * @throws InvalidParamException Expressions are incorrect
+     */
+    public CssTextSpacingTrim(ApplContext ac, CssExpression expression, boolean check)
+            throws InvalidParamException {
+        throw new InvalidParamException("value",
+                expression.getValue().toString(),
+                getPropertyName(), ac);
+    }
+
+    public CssTextSpacingTrim(ApplContext ac, CssExpression expression)
+            throws InvalidParamException {
+        this(ac, expression, false);
+    }
+
+    /**
+     * Returns the value of this property
+     */
+    public Object get() {
+        return value;
+    }
+
+
+    /**
+     * Returns the name of this property
+     */
+    public final String getPropertyName() {
+        return "text-spacing-trim";
+    }
+
+    /**
+     * Returns true if this property is "softly" inherited
+     * e.g. his value is equals to inherit
+     */
+    public boolean isSoftlyInherited() {
+        return value.equals(inherit);
+    }
+
+    /**
+     * Returns a string representation of the object.
+     */
+    public String toString() {
+        return value.toString();
+    }
+
+    /**
+     * Add this property to the CssStyle.
+     *
+     * @param style The CssStyle
+     */
+    public void addToStyle(ApplContext ac, CssStyle style) {
+        Css3Style s = (Css3Style) style;
+        if (s.cssTextSpacingTrim != null) {
+            style.addRedefinitionWarning(ac, this);
+        }
+        s.cssTextSpacingTrim = this;
+    }
+
+
+    /**
+     * Compares two properties for equality.
+     *
+     * @param property The other property.
+     */
+    public boolean equals(CssProperty property) {
+        return (property instanceof CssTextSpacingTrim &&
+                value.equals(((CssTextSpacingTrim) property).value));
+    }
+
+
+    /**
+     * Get this property in the style.
+     *
+     * @param style   The style where the property is
+     * @param resolve if true, resolve the style to find this property
+     */
+    public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
+        if (resolve) {
+            return ((Css3Style) style).getTextSpacingTrim();
+        } else {
+            return ((Css3Style) style).cssTextSpacingTrim;
+        }
+    }
+}
+
diff --git a/org/w3c/css/properties/css/CssTextWrap.java b/org/w3c/css/properties/css/CssTextWrap.java
new file mode 100644
index 000000000..f1b2992d7
--- /dev/null
+++ b/org/w3c/css/properties/css/CssTextWrap.java
@@ -0,0 +1,113 @@
+//
+// Author: Yves Lafon 
+//
+// (c) COPYRIGHT MIT, ERCIM, Keio, Beihang, 2022.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.properties.css;
+
+import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css3.Css3Style;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+
+/**
+ * @since CSS3
+ */
+public class CssTextWrap extends CssProperty {
+
+    /**
+     * Create a new CssTextWrap
+     */
+    public CssTextWrap() {
+    }
+
+    /**
+     * Creates a new CssTextWrap
+     *
+     * @param expression The expression for this property
+     * @throws InvalidParamException
+     *          Expressions are incorrect
+     */
+    public CssTextWrap(ApplContext ac, CssExpression expression, boolean check)
+            throws InvalidParamException {
+        throw new InvalidParamException("value",
+                expression.getValue().toString(),
+                getPropertyName(), ac);
+    }
+
+    public CssTextWrap(ApplContext ac, CssExpression expression)
+            throws InvalidParamException {
+        this(ac, expression, false);
+    }
+
+    /**
+     * Returns the value of this property
+     */
+    public Object get() {
+        return value;
+    }
+
+
+    /**
+     * Returns the name of this property
+     */
+    public final String getPropertyName() {
+        return "text-wrap";
+    }
+
+    /**
+     * Returns true if this property is "softly" inherited
+     * e.g. his value is equals to inherit
+     */
+    public boolean isSoftlyInherited() {
+        return value.equals(inherit);
+    }
+
+    /**
+     * Returns a string representation of the object.
+     */
+    public String toString() {
+        return value.toString();
+    }
+
+    /**
+     * Add this property to the CssStyle.
+     *
+     * @param style The CssStyle
+     */
+    public void addToStyle(ApplContext ac, CssStyle style) {
+        Css3Style s = (Css3Style) style;
+        if (s.cssTextWrap != null) {
+            style.addRedefinitionWarning(ac, this);
+        }
+        s.cssTextWrap = this;
+    }
+
+
+    /**
+     * Compares two properties for equality.
+     *
+     * @param property The other property.
+     */
+    public boolean equals(CssProperty property) {
+        return (property instanceof CssTextWrap &&
+                value.equals(((CssTextWrap) property).value));
+    }
+
+
+    /**
+     * Get this property in the style.
+     *
+     * @param style   The style where the property is
+     * @param resolve if true, resolve the style to find this property
+     */
+    public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
+        if (resolve) {
+            return ((Css3Style) style).getTextWrap();
+        } else {
+            return ((Css3Style) style).cssTextWrap;
+        }
+    }
+}
+
diff --git a/org/w3c/css/properties/css/CssTextWrapMode.java b/org/w3c/css/properties/css/CssTextWrapMode.java
new file mode 100644
index 000000000..afe06c780
--- /dev/null
+++ b/org/w3c/css/properties/css/CssTextWrapMode.java
@@ -0,0 +1,113 @@
+//
+// Author: Yves Lafon 
+//
+// (c) COPYRIGHT MIT, ERCIM, Keio, Beihang, 2022.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.properties.css;
+
+import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css3.Css3Style;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+
+/**
+ * @since CSS3
+ */
+public class CssTextWrapMode extends CssProperty {
+
+    /**
+     * Create a new CssTextWrapMode
+     */
+    public CssTextWrapMode() {
+    }
+
+    /**
+     * Creates a new CssTextWrapMode
+     *
+     * @param expression The expression for this property
+     * @throws InvalidParamException
+     *          Expressions are incorrect
+     */
+    public CssTextWrapMode(ApplContext ac, CssExpression expression, boolean check)
+            throws InvalidParamException {
+        throw new InvalidParamException("value",
+                expression.getValue().toString(),
+                getPropertyName(), ac);
+    }
+
+    public CssTextWrapMode(ApplContext ac, CssExpression expression)
+            throws InvalidParamException {
+        this(ac, expression, false);
+    }
+
+    /**
+     * Returns the value of this property
+     */
+    public Object get() {
+        return value;
+    }
+
+
+    /**
+     * Returns the name of this property
+     */
+    public final String getPropertyName() {
+        return "text-wrap-mode";
+    }
+
+    /**
+     * Returns true if this property is "softly" inherited
+     * e.g. his value is equals to inherit
+     */
+    public boolean isSoftlyInherited() {
+        return value.equals(inherit);
+    }
+
+    /**
+     * Returns a string representation of the object.
+     */
+    public String toString() {
+        return value.toString();
+    }
+
+    /**
+     * Add this property to the CssStyle.
+     *
+     * @param style The CssStyle
+     */
+    public void addToStyle(ApplContext ac, CssStyle style) {
+        Css3Style s = (Css3Style) style;
+        if (s.cssTextWrapMode != null) {
+            style.addRedefinitionWarning(ac, this);
+        }
+        s.cssTextWrapMode = this;
+    }
+
+
+    /**
+     * Compares two properties for equality.
+     *
+     * @param property The other property.
+     */
+    public boolean equals(CssProperty property) {
+        return (property instanceof CssTextWrapMode &&
+                value.equals(((CssTextWrapMode) property).value));
+    }
+
+
+    /**
+     * Get this property in the style.
+     *
+     * @param style   The style where the property is
+     * @param resolve if true, resolve the style to find this property
+     */
+    public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
+        if (resolve) {
+            return ((Css3Style) style).getTextWrapMode();
+        } else {
+            return ((Css3Style) style).cssTextWrapMode;
+        }
+    }
+}
+
diff --git a/org/w3c/css/properties/css/CssTextWrapStyle.java b/org/w3c/css/properties/css/CssTextWrapStyle.java
new file mode 100644
index 000000000..00347482d
--- /dev/null
+++ b/org/w3c/css/properties/css/CssTextWrapStyle.java
@@ -0,0 +1,113 @@
+//
+// Author: Yves Lafon 
+//
+// (c) COPYRIGHT MIT, ERCIM, Keio, Beihang, 2022.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.properties.css;
+
+import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css3.Css3Style;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+
+/**
+ * @since CSS3
+ */
+public class CssTextWrapStyle extends CssProperty {
+
+    /**
+     * Create a new CssTextWrapStyle
+     */
+    public CssTextWrapStyle() {
+    }
+
+    /**
+     * Creates a new CssTextWrapStyle
+     *
+     * @param expression The expression for this property
+     * @throws InvalidParamException
+     *          Expressions are incorrect
+     */
+    public CssTextWrapStyle(ApplContext ac, CssExpression expression, boolean check)
+            throws InvalidParamException {
+        throw new InvalidParamException("value",
+                expression.getValue().toString(),
+                getPropertyName(), ac);
+    }
+
+    public CssTextWrapStyle(ApplContext ac, CssExpression expression)
+            throws InvalidParamException {
+        this(ac, expression, false);
+    }
+
+    /**
+     * Returns the value of this property
+     */
+    public Object get() {
+        return value;
+    }
+
+
+    /**
+     * Returns the name of this property
+     */
+    public final String getPropertyName() {
+        return "text-wrap-style";
+    }
+
+    /**
+     * Returns true if this property is "softly" inherited
+     * e.g. his value is equals to inherit
+     */
+    public boolean isSoftlyInherited() {
+        return value.equals(inherit);
+    }
+
+    /**
+     * Returns a string representation of the object.
+     */
+    public String toString() {
+        return value.toString();
+    }
+
+    /**
+     * Add this property to the CssStyle.
+     *
+     * @param style The CssStyle
+     */
+    public void addToStyle(ApplContext ac, CssStyle style) {
+        Css3Style s = (Css3Style) style;
+        if (s.cssTextWrapStyle != null) {
+            style.addRedefinitionWarning(ac, this);
+        }
+        s.cssTextWrapStyle = this;
+    }
+
+
+    /**
+     * Compares two properties for equality.
+     *
+     * @param property The other property.
+     */
+    public boolean equals(CssProperty property) {
+        return (property instanceof CssTextWrapStyle &&
+                value.equals(((CssTextWrapStyle) property).value));
+    }
+
+
+    /**
+     * Get this property in the style.
+     *
+     * @param style   The style where the property is
+     * @param resolve if true, resolve the style to find this property
+     */
+    public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
+        if (resolve) {
+            return ((Css3Style) style).getTextWrapStyle();
+        } else {
+            return ((Css3Style) style).cssTextWrapStyle;
+        }
+    }
+}
+
diff --git a/org/w3c/css/properties/css/CssTranslate.java b/org/w3c/css/properties/css/CssTranslate.java
new file mode 100644
index 000000000..cf453be0c
--- /dev/null
+++ b/org/w3c/css/properties/css/CssTranslate.java
@@ -0,0 +1,113 @@
+//
+// Author: Yves Lafon 
+//
+// (c) COPYRIGHT World Wide Web Consortium, 2025.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.properties.css;
+
+import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css3.Css3Style;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+
+/**
+ * @since CSS3
+ */
+public class CssTranslate extends CssProperty {
+
+    /**
+     * Create a new CssTranslate
+     */
+    public CssTranslate() {
+    }
+
+    /**
+     * Creates a new CssTranslate
+     *
+     * @param expression The expression for this property
+     * @throws InvalidParamException
+     *          Expressions are incorrect
+     */
+    public CssTranslate(ApplContext ac, CssExpression expression, boolean check)
+            throws InvalidParamException {
+        throw new InvalidParamException("value",
+                expression.getValue().toString(),
+                getPropertyName(), ac);
+    }
+
+    public CssTranslate(ApplContext ac, CssExpression expression)
+            throws InvalidParamException {
+        this(ac, expression, false);
+    }
+
+    /**
+     * Returns the value of this property
+     */
+    public Object get() {
+        return value;
+    }
+
+
+    /**
+     * Returns the name of this property
+     */
+    public final String getPropertyName() {
+        return "translate";
+    }
+
+    /**
+     * Returns true if this property is "softly" inherited
+     * e.g. his value is equals to inherit
+     */
+    public boolean isSoftlyInherited() {
+        return value.equals(inherit);
+    }
+
+    /**
+     * Returns a string representation of the object.
+     */
+    public String toString() {
+        return value.toString();
+    }
+
+    /**
+     * Add this property to the CssStyle.
+     *
+     * @param style The CssStyle
+     */
+    public void addToStyle(ApplContext ac, CssStyle style) {
+        Css3Style s = (Css3Style) style;
+        if (s.cssTranslate != null) {
+            style.addRedefinitionWarning(ac, this);
+        }
+        s.cssTranslate = this;
+    }
+
+
+    /**
+     * Compares two properties for equality.
+     *
+     * @param property The other property.
+     */
+    public boolean equals(CssProperty property) {
+        return (property instanceof CssTranslate &&
+                value.equals(((CssTranslate) property).value));
+    }
+
+
+    /**
+     * Get this property in the style.
+     *
+     * @param style   The style where the property is
+     * @param resolve if true, resolve the style to find this property
+     */
+    public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
+        if (resolve) {
+            return ((Css3Style) style).getTranslate();
+        } else {
+            return ((Css3Style) style).cssTranslate;
+        }
+    }
+}
+
diff --git a/org/w3c/css/properties/css/CssWhiteSpaceCollapse.java b/org/w3c/css/properties/css/CssWhiteSpaceCollapse.java
new file mode 100644
index 000000000..da2db1bd9
--- /dev/null
+++ b/org/w3c/css/properties/css/CssWhiteSpaceCollapse.java
@@ -0,0 +1,112 @@
+//
+// Author: Yves Lafon 
+//
+// (c) COPYRIGHT World Wide Web Consortium, 2024.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.properties.css;
+
+import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css3.Css3Style;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+
+/**
+ * @since CSS3
+ */
+public class CssWhiteSpaceCollapse extends CssProperty {
+
+    /**
+     * Create a new CssWhiteSpaceCollapse
+     */
+    public CssWhiteSpaceCollapse() {
+    }
+
+    /**
+     * Creates a new CssWhiteSpaceCollapse
+     *
+     * @param expression The expression for this property
+     * @throws InvalidParamException Expressions are incorrect
+     */
+    public CssWhiteSpaceCollapse(ApplContext ac, CssExpression expression, boolean check)
+            throws InvalidParamException {
+        throw new InvalidParamException("value",
+                expression.getValue().toString(),
+                getPropertyName(), ac);
+    }
+
+    public CssWhiteSpaceCollapse(ApplContext ac, CssExpression expression)
+            throws InvalidParamException {
+        this(ac, expression, false);
+    }
+
+    /**
+     * Returns the value of this property
+     */
+    public Object get() {
+        return value;
+    }
+
+
+    /**
+     * Returns the name of this property
+     */
+    public final String getPropertyName() {
+        return "white-space-collapse";
+    }
+
+    /**
+     * Returns true if this property is "softly" inherited
+     * e.g. his value is equals to inherit
+     */
+    public boolean isSoftlyInherited() {
+        return value.equals(inherit);
+    }
+
+    /**
+     * Returns a string representation of the object.
+     */
+    public String toString() {
+        return value.toString();
+    }
+
+    /**
+     * Add this property to the CssStyle.
+     *
+     * @param style The CssStyle
+     */
+    public void addToStyle(ApplContext ac, CssStyle style) {
+        Css3Style s = (Css3Style) style;
+        if (s.cssWhiteSpaceCollapse != null) {
+            style.addRedefinitionWarning(ac, this);
+        }
+        s.cssWhiteSpaceCollapse = this;
+    }
+
+
+    /**
+     * Compares two properties for equality.
+     *
+     * @param property The other property.
+     */
+    public boolean equals(CssProperty property) {
+        return (property instanceof CssWhiteSpaceCollapse &&
+                value.equals(((CssWhiteSpaceCollapse) property).value));
+    }
+
+
+    /**
+     * Get this property in the style.
+     *
+     * @param style   The style where the property is
+     * @param resolve if true, resolve the style to find this property
+     */
+    public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
+        if (resolve) {
+            return ((Css3Style) style).getWhiteSpaceCollapse();
+        } else {
+            return ((Css3Style) style).cssWhiteSpaceCollapse;
+        }
+    }
+}
+
diff --git a/org/w3c/css/properties/css/CssWhiteSpaceTrim.java b/org/w3c/css/properties/css/CssWhiteSpaceTrim.java
new file mode 100644
index 000000000..63db9917c
--- /dev/null
+++ b/org/w3c/css/properties/css/CssWhiteSpaceTrim.java
@@ -0,0 +1,112 @@
+//
+// Author: Yves Lafon 
+//
+// (c) COPYRIGHT MIT, ERCIM, Keio, Beihang, 2022.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.properties.css;
+
+import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css3.Css3Style;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+
+/**
+ * @since CSS3
+ */
+public class CssWhiteSpaceTrim extends CssProperty {
+
+    /**
+     * Create a new CssWhiteSpaceTrim
+     */
+    public CssWhiteSpaceTrim() {
+    }
+
+    /**
+     * Creates a new CssWhiteSpaceTrim
+     *
+     * @param expression The expression for this property
+     * @throws InvalidParamException Expressions are incorrect
+     */
+    public CssWhiteSpaceTrim(ApplContext ac, CssExpression expression, boolean check)
+            throws InvalidParamException {
+        throw new InvalidParamException("value",
+                expression.getValue().toString(),
+                getPropertyName(), ac);
+    }
+
+    public CssWhiteSpaceTrim(ApplContext ac, CssExpression expression)
+            throws InvalidParamException {
+        this(ac, expression, false);
+    }
+
+    /**
+     * Returns the value of this property
+     */
+    public Object get() {
+        return value;
+    }
+
+
+    /**
+     * Returns the name of this property
+     */
+    public final String getPropertyName() {
+        return "white-space-trim";
+    }
+
+    /**
+     * Returns true if this property is "softly" inherited
+     * e.g. his value is equals to inherit
+     */
+    public boolean isSoftlyInherited() {
+        return value.equals(inherit);
+    }
+
+    /**
+     * Returns a string representation of the object.
+     */
+    public String toString() {
+        return value.toString();
+    }
+
+    /**
+     * Add this property to the CssStyle.
+     *
+     * @param style The CssStyle
+     */
+    public void addToStyle(ApplContext ac, CssStyle style) {
+        Css3Style s = (Css3Style) style;
+        if (s.cssWhiteSpaceTrim != null) {
+            style.addRedefinitionWarning(ac, this);
+        }
+        s.cssWhiteSpaceTrim = this;
+    }
+
+
+    /**
+     * Compares two properties for equality.
+     *
+     * @param property The other property.
+     */
+    public boolean equals(CssProperty property) {
+        return (property instanceof CssWhiteSpaceTrim &&
+                value.equals(((CssWhiteSpaceTrim) property).value));
+    }
+
+
+    /**
+     * Get this property in the style.
+     *
+     * @param style   The style where the property is
+     * @param resolve if true, resolve the style to find this property
+     */
+    public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
+        if (resolve) {
+            return ((Css3Style) style).getWhiteSpaceTrim();
+        } else {
+            return ((Css3Style) style).cssWhiteSpaceTrim;
+        }
+    }
+}
+
diff --git a/org/w3c/css/properties/css/CssWordSpaceTransform.java b/org/w3c/css/properties/css/CssWordSpaceTransform.java
new file mode 100644
index 000000000..d3005f2a3
--- /dev/null
+++ b/org/w3c/css/properties/css/CssWordSpaceTransform.java
@@ -0,0 +1,113 @@
+//
+// Author: Yves Lafon 
+//
+// (c) COPYRIGHT MIT, ERCIM, Keio, Beihang, 2022.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.properties.css;
+
+import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css3.Css3Style;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+
+/**
+ * @since CSS3
+ */
+public class CssWordSpaceTransform extends CssProperty {
+
+    /**
+     * Create a new CssWordSpaceTransform
+     */
+    public CssWordSpaceTransform() {
+    }
+
+    /**
+     * Creates a new CssWordSpaceTransform
+     *
+     * @param expression The expression for this property
+     * @throws InvalidParamException
+     *          Expressions are incorrect
+     */
+    public CssWordSpaceTransform(ApplContext ac, CssExpression expression, boolean check)
+            throws InvalidParamException {
+        throw new InvalidParamException("value",
+                expression.getValue().toString(),
+                getPropertyName(), ac);
+    }
+
+    public CssWordSpaceTransform(ApplContext ac, CssExpression expression)
+            throws InvalidParamException {
+        this(ac, expression, false);
+    }
+
+    /**
+     * Returns the value of this property
+     */
+    public Object get() {
+        return value;
+    }
+
+
+    /**
+     * Returns the name of this property
+     */
+    public final String getPropertyName() {
+        return "word-space-transform";
+    }
+
+    /**
+     * Returns true if this property is "softly" inherited
+     * e.g. his value is equals to inherit
+     */
+    public boolean isSoftlyInherited() {
+        return value.equals(inherit);
+    }
+
+    /**
+     * Returns a string representation of the object.
+     */
+    public String toString() {
+        return value.toString();
+    }
+
+    /**
+     * Add this property to the CssStyle.
+     *
+     * @param style The CssStyle
+     */
+    public void addToStyle(ApplContext ac, CssStyle style) {
+        Css3Style s = (Css3Style) style;
+        if (s.cssWordSpaceTransform != null) {
+            style.addRedefinitionWarning(ac, this);
+        }
+        s.cssWordSpaceTransform = this;
+    }
+
+
+    /**
+     * Compares two properties for equality.
+     *
+     * @param property The other property.
+     */
+    public boolean equals(CssProperty property) {
+        return (property instanceof CssWordSpaceTransform &&
+                value.equals(((CssWordSpaceTransform) property).value));
+    }
+
+
+    /**
+     * Get this property in the style.
+     *
+     * @param style   The style where the property is
+     * @param resolve if true, resolve the style to find this property
+     */
+    public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
+        if (resolve) {
+            return ((Css3Style) style).getWordSpaceTransform();
+        } else {
+            return ((Css3Style) style).cssWordSpaceTransform;
+        }
+    }
+}
+
diff --git a/org/w3c/css/properties/css/CssWrapAfter.java b/org/w3c/css/properties/css/CssWrapAfter.java
new file mode 100644
index 000000000..7026769bf
--- /dev/null
+++ b/org/w3c/css/properties/css/CssWrapAfter.java
@@ -0,0 +1,113 @@
+//
+// Author: Yves Lafon 
+//
+// (c) COPYRIGHT MIT, ERCIM, Keio, Beihang, 2022.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.properties.css;
+
+import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css3.Css3Style;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+
+/**
+ * @since CSS3
+ */
+public class CssWrapAfter extends CssProperty {
+
+    /**
+     * Create a new CssWrapAfter
+     */
+    public CssWrapAfter() {
+    }
+
+    /**
+     * Creates a new CssWrapAfter
+     *
+     * @param expression The expression for this property
+     * @throws InvalidParamException
+     *          Expressions are incorrect
+     */
+    public CssWrapAfter(ApplContext ac, CssExpression expression, boolean check)
+            throws InvalidParamException {
+        throw new InvalidParamException("value",
+                expression.getValue().toString(),
+                getPropertyName(), ac);
+    }
+
+    public CssWrapAfter(ApplContext ac, CssExpression expression)
+            throws InvalidParamException {
+        this(ac, expression, false);
+    }
+
+    /**
+     * Returns the value of this property
+     */
+    public Object get() {
+        return value;
+    }
+
+
+    /**
+     * Returns the name of this property
+     */
+    public final String getPropertyName() {
+        return "wrap-after";
+    }
+
+    /**
+     * Returns true if this property is "softly" inherited
+     * e.g. his value is equals to inherit
+     */
+    public boolean isSoftlyInherited() {
+        return value.equals(inherit);
+    }
+
+    /**
+     * Returns a string representation of the object.
+     */
+    public String toString() {
+        return value.toString();
+    }
+
+    /**
+     * Add this property to the CssStyle.
+     *
+     * @param style The CssStyle
+     */
+    public void addToStyle(ApplContext ac, CssStyle style) {
+        Css3Style s = (Css3Style) style;
+        if (s.cssWrapAfter != null) {
+            style.addRedefinitionWarning(ac, this);
+        }
+        s.cssWrapAfter = this;
+    }
+
+
+    /**
+     * Compares two properties for equality.
+     *
+     * @param property The other property.
+     */
+    public boolean equals(CssProperty property) {
+        return (property instanceof CssWrapAfter &&
+                value.equals(((CssWrapAfter) property).value));
+    }
+
+
+    /**
+     * Get this property in the style.
+     *
+     * @param style   The style where the property is
+     * @param resolve if true, resolve the style to find this property
+     */
+    public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
+        if (resolve) {
+            return ((Css3Style) style).getWrapAfter();
+        } else {
+            return ((Css3Style) style).cssWrapAfter;
+        }
+    }
+}
+
diff --git a/org/w3c/css/properties/css/CssWrapBefore.java b/org/w3c/css/properties/css/CssWrapBefore.java
new file mode 100644
index 000000000..29fef92a4
--- /dev/null
+++ b/org/w3c/css/properties/css/CssWrapBefore.java
@@ -0,0 +1,113 @@
+//
+// Author: Yves Lafon 
+//
+// (c) COPYRIGHT MIT, ERCIM, Keio, Beihang, 2022.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.properties.css;
+
+import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css3.Css3Style;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+
+/**
+ * @since CSS3
+ */
+public class CssWrapBefore extends CssProperty {
+
+    /**
+     * Create a new CssWrapBefore
+     */
+    public CssWrapBefore() {
+    }
+
+    /**
+     * Creates a new CssWrapBefore
+     *
+     * @param expression The expression for this property
+     * @throws InvalidParamException
+     *          Expressions are incorrect
+     */
+    public CssWrapBefore(ApplContext ac, CssExpression expression, boolean check)
+            throws InvalidParamException {
+        throw new InvalidParamException("value",
+                expression.getValue().toString(),
+                getPropertyName(), ac);
+    }
+
+    public CssWrapBefore(ApplContext ac, CssExpression expression)
+            throws InvalidParamException {
+        this(ac, expression, false);
+    }
+
+    /**
+     * Returns the value of this property
+     */
+    public Object get() {
+        return value;
+    }
+
+
+    /**
+     * Returns the name of this property
+     */
+    public final String getPropertyName() {
+        return "wrap-before";
+    }
+
+    /**
+     * Returns true if this property is "softly" inherited
+     * e.g. his value is equals to inherit
+     */
+    public boolean isSoftlyInherited() {
+        return value.equals(inherit);
+    }
+
+    /**
+     * Returns a string representation of the object.
+     */
+    public String toString() {
+        return value.toString();
+    }
+
+    /**
+     * Add this property to the CssStyle.
+     *
+     * @param style The CssStyle
+     */
+    public void addToStyle(ApplContext ac, CssStyle style) {
+        Css3Style s = (Css3Style) style;
+        if (s.cssWrapBefore != null) {
+            style.addRedefinitionWarning(ac, this);
+        }
+        s.cssWrapBefore = this;
+    }
+
+
+    /**
+     * Compares two properties for equality.
+     *
+     * @param property The other property.
+     */
+    public boolean equals(CssProperty property) {
+        return (property instanceof CssWrapBefore &&
+                value.equals(((CssWrapBefore) property).value));
+    }
+
+
+    /**
+     * Get this property in the style.
+     *
+     * @param style   The style where the property is
+     * @param resolve if true, resolve the style to find this property
+     */
+    public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
+        if (resolve) {
+            return ((Css3Style) style).getWrapBefore();
+        } else {
+            return ((Css3Style) style).cssWrapBefore;
+        }
+    }
+}
+
diff --git a/org/w3c/css/properties/css/CssWrapInside.java b/org/w3c/css/properties/css/CssWrapInside.java
new file mode 100644
index 000000000..b6c1a0efd
--- /dev/null
+++ b/org/w3c/css/properties/css/CssWrapInside.java
@@ -0,0 +1,113 @@
+//
+// Author: Yves Lafon 
+//
+// (c) COPYRIGHT MIT, ERCIM, Keio, Beihang, 2022.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.properties.css;
+
+import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css3.Css3Style;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+
+/**
+ * @since CSS3
+ */
+public class CssWrapInside extends CssProperty {
+
+    /**
+     * Create a new CssWrapInside
+     */
+    public CssWrapInside() {
+    }
+
+    /**
+     * Creates a new CssWrapInside
+     *
+     * @param expression The expression for this property
+     * @throws InvalidParamException
+     *          Expressions are incorrect
+     */
+    public CssWrapInside(ApplContext ac, CssExpression expression, boolean check)
+            throws InvalidParamException {
+        throw new InvalidParamException("value",
+                expression.getValue().toString(),
+                getPropertyName(), ac);
+    }
+
+    public CssWrapInside(ApplContext ac, CssExpression expression)
+            throws InvalidParamException {
+        this(ac, expression, false);
+    }
+
+    /**
+     * Returns the value of this property
+     */
+    public Object get() {
+        return value;
+    }
+
+
+    /**
+     * Returns the name of this property
+     */
+    public final String getPropertyName() {
+        return "wrap-inside";
+    }
+
+    /**
+     * Returns true if this property is "softly" inherited
+     * e.g. his value is equals to inherit
+     */
+    public boolean isSoftlyInherited() {
+        return value.equals(inherit);
+    }
+
+    /**
+     * Returns a string representation of the object.
+     */
+    public String toString() {
+        return value.toString();
+    }
+
+    /**
+     * Add this property to the CssStyle.
+     *
+     * @param style The CssStyle
+     */
+    public void addToStyle(ApplContext ac, CssStyle style) {
+        Css3Style s = (Css3Style) style;
+        if (s.cssWrapInside != null) {
+            style.addRedefinitionWarning(ac, this);
+        }
+        s.cssWrapInside = this;
+    }
+
+
+    /**
+     * Compares two properties for equality.
+     *
+     * @param property The other property.
+     */
+    public boolean equals(CssProperty property) {
+        return (property instanceof CssWrapInside &&
+                value.equals(((CssWrapInside) property).value));
+    }
+
+
+    /**
+     * Get this property in the style.
+     *
+     * @param style   The style where the property is
+     * @param resolve if true, resolve the style to find this property
+     */
+    public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
+        if (resolve) {
+            return ((Css3Style) style).getWrapInside();
+        } else {
+            return ((Css3Style) style).cssWrapInside;
+        }
+    }
+}
+
diff --git a/org/w3c/css/properties/css1/Css1Style.java b/org/w3c/css/properties/css1/Css1Style.java
index 9a2e23c68..8c82d06f8 100644
--- a/org/w3c/css/properties/css1/Css1Style.java
+++ b/org/w3c/css/properties/css1/Css1Style.java
@@ -39,8 +39,7 @@
 import org.w3c.css.util.Util;
 import org.w3c.css.util.Warning;
 import org.w3c.css.util.Warnings;
-import org.w3c.css.values.CssLength;
-import org.w3c.css.values.CssPercentage;
+import org.w3c.css.values.CssCheckableValue;
 import org.w3c.css.values.CssTypes;
 import org.w3c.css.values.CssValue;
 
@@ -1051,7 +1050,7 @@ final void compute(CssValue value) {
             case CssTypes.CSS_PERCENTAGE:
                 // FIXME, it depends on the unit of the parent in the cascade.
                 try {
-                    CssPercentage percent = value.getPercentage();
+                    CssCheckableValue percent = value.getCheckableValue();
                     if (!percent.isZero()) {
                         relative = true;
                     }
@@ -1061,13 +1060,15 @@ final void compute(CssValue value) {
                 break;
             case CssTypes.CSS_LENGTH:
                 try {
-                    CssLength length = value.getLength();
+                    CssCheckableValue length = value.getCheckableValue();
                     // 0 is always 0, no need to check
                     if (!length.isZero()) {
-                        if (length.isAbsolute()) {
-                            absolute = true;
-                        } else {
-                            relative = true;
+                        if (length.getRawType() == CssTypes.CSS_LENGTH) {
+                            if (length.getLength().isAbsolute()) {
+                                absolute = true;
+                            } else {
+                                relative = true;
+                            }
                         }
                     }
                 } catch (InvalidParamException ipe) {
diff --git a/org/w3c/css/properties/css3/Css3Style.java b/org/w3c/css/properties/css3/Css3Style.java
index bf2cb3e4d..9562af752 100644
--- a/org/w3c/css/properties/css3/Css3Style.java
+++ b/org/w3c/css/properties/css3/Css3Style.java
@@ -52,6 +52,12 @@
 import org.w3c.css.properties.css.CssBorderBlockWidth;
 import org.w3c.css.properties.css.CssBorderEndEndRadius;
 import org.w3c.css.properties.css.CssBorderEndStartRadius;
+import org.w3c.css.properties.css.CssHyphenateCharacter;
+import org.w3c.css.properties.css.CssHyphenateLimitChars;
+import org.w3c.css.properties.css.CssHyphenateLimitLast;
+import org.w3c.css.properties.css.CssHyphenateLimitLines;
+import org.w3c.css.properties.css.CssHyphenateLimitZone;
+import org.w3c.css.properties.css.CssImageRendering;
 import org.w3c.css.properties.css.CssBorderImageSource;
 import org.w3c.css.properties.css.CssBorderInline;
 import org.w3c.css.properties.css.CssBorderInlineColor;
@@ -91,6 +97,7 @@
 import org.w3c.css.properties.css.CssColumnWidth;
 import org.w3c.css.properties.css.CssColumns;
 import org.w3c.css.properties.css.CssContain;
+import org.w3c.css.properties.css.CssContentVisibility;
 import org.w3c.css.properties.css.CssCounterSet;
 import org.w3c.css.properties.css.CssDominantBaseline;
 import org.w3c.css.properties.css.CssFilter;
@@ -167,6 +174,7 @@
 import org.w3c.css.properties.css.CssJustifySelf;
 import org.w3c.css.properties.css.CssLightingColor;
 import org.w3c.css.properties.css.CssLineBreak;
+import org.w3c.css.properties.css.CssLinePadding;
 import org.w3c.css.properties.css.CssMarginBlock;
 import org.w3c.css.properties.css.CssMarginBlockEnd;
 import org.w3c.css.properties.css.CssMarginBlockStart;
@@ -197,6 +205,11 @@
 import org.w3c.css.properties.css.CssOverflowWrap;
 import org.w3c.css.properties.css.CssOverflowX;
 import org.w3c.css.properties.css.CssOverflowY;
+import org.w3c.css.properties.css.CssOverscrollBehavior;
+import org.w3c.css.properties.css.CssOverscrollBehaviorBlock;
+import org.w3c.css.properties.css.CssOverscrollBehaviorInline;
+import org.w3c.css.properties.css.CssOverscrollBehaviorX;
+import org.w3c.css.properties.css.CssOverscrollBehaviorY;
 import org.w3c.css.properties.css.CssPaddingBlock;
 import org.w3c.css.properties.css.CssPaddingBlockEnd;
 import org.w3c.css.properties.css.CssPaddingBlockStart;
@@ -213,10 +226,12 @@
 import org.w3c.css.properties.css.CssRest;
 import org.w3c.css.properties.css.CssRestAfter;
 import org.w3c.css.properties.css.CssRestBefore;
+import org.w3c.css.properties.css.CssRotate;
 import org.w3c.css.properties.css.CssRowGap;
 import org.w3c.css.properties.css.CssRubyAlign;
 import org.w3c.css.properties.css.CssRubyMerge;
 import org.w3c.css.properties.css.CssRubyPosition;
+import org.w3c.css.properties.css.CssScale;
 import org.w3c.css.properties.css.CssScrollBehavior;
 import org.w3c.css.properties.css.CssScrollMargin;
 import org.w3c.css.properties.css.CssScrollMarginBlock;
@@ -249,6 +264,7 @@
 import org.w3c.css.properties.css.CssTabSize;
 import org.w3c.css.properties.css.CssTextAlignAll;
 import org.w3c.css.properties.css.CssTextAlignLast;
+import org.w3c.css.properties.css.CssTextAutospace;
 import org.w3c.css.properties.css.CssTextCombineUpright;
 import org.w3c.css.properties.css.CssTextDecorationColor;
 import org.w3c.css.properties.css.CssTextDecorationLine;
@@ -264,12 +280,18 @@
 import org.w3c.css.properties.css.CssTextEmphasisColor;
 import org.w3c.css.properties.css.CssTextEmphasisPosition;
 import org.w3c.css.properties.css.CssTextEmphasisStyle;
+import org.w3c.css.properties.css.CssTextGroupAlign;
 import org.w3c.css.properties.css.CssTextJustify;
 import org.w3c.css.properties.css.CssTextOrientation;
 import org.w3c.css.properties.css.CssTextOverflow;
 import org.w3c.css.properties.css.CssTextSizeAdjust;
+import org.w3c.css.properties.css.CssTextSpacing;
+import org.w3c.css.properties.css.CssTextSpacingTrim;
 import org.w3c.css.properties.css.CssTextUnderlineOffset;
 import org.w3c.css.properties.css.CssTextUnderlinePosition;
+import org.w3c.css.properties.css.CssTextWrap;
+import org.w3c.css.properties.css.CssTextWrapMode;
+import org.w3c.css.properties.css.CssTextWrapStyle;
 import org.w3c.css.properties.css.CssTouchAction;
 import org.w3c.css.properties.css.CssTransform;
 import org.w3c.css.properties.css.CssTransformBox;
@@ -280,6 +302,7 @@
 import org.w3c.css.properties.css.CssTransitionDuration;
 import org.w3c.css.properties.css.CssTransitionProperty;
 import org.w3c.css.properties.css.CssTransitionTimingFunction;
+import org.w3c.css.properties.css.CssTranslate;
 import org.w3c.css.properties.css.CssUserSelect;
 import org.w3c.css.properties.css.CssVoiceBalance;
 import org.w3c.css.properties.css.CssVoiceDuration;
@@ -288,8 +311,14 @@
 import org.w3c.css.properties.css.CssVoiceRate;
 import org.w3c.css.properties.css.CssVoiceStress;
 import org.w3c.css.properties.css.CssVoiceVolume;
+import org.w3c.css.properties.css.CssWhiteSpaceCollapse;
+import org.w3c.css.properties.css.CssWhiteSpaceTrim;
 import org.w3c.css.properties.css.CssWillChange;
 import org.w3c.css.properties.css.CssWordBreak;
+import org.w3c.css.properties.css.CssWordSpaceTransform;
+import org.w3c.css.properties.css.CssWrapAfter;
+import org.w3c.css.properties.css.CssWrapBefore;
+import org.w3c.css.properties.css.CssWrapInside;
 import org.w3c.css.properties.css.CssWritingMode;
 import org.w3c.css.properties.css.counterstyle.CssAdditiveSymbols;
 import org.w3c.css.properties.css.counterstyle.CssFallback;
@@ -538,6 +567,7 @@ public class Css3Style extends ATSCStyle {
     public CssTransformOrigin cssTransformOrigin;
     public CssTransform cssTransform;
     public CssTransformBox cssTransformBox;
+    public CssScale cssScale;
 
     public CssBoxSizing cssBoxSizing;
     public CssResize cssResize;
@@ -560,6 +590,7 @@ public class Css3Style extends ATSCStyle {
     public CssObjectPosition cssObjectPosition;
     public CssImageOrientation cssImageOrientation;
     public CssImageResolution cssImageResolution;
+    public CssImageRendering cssImageRendering;
 
     CssRubySpan cssRubySpan;
 
@@ -598,7 +629,7 @@ public class Css3Style extends ATSCStyle {
     public org.w3c.css.properties.css.fontface.CssFontFamily fontFaceCssFontFamily;
     public org.w3c.css.properties.css.fontface.CssFontFeatureSettings fontFaceCssFontFeatureSettings;
     public org.w3c.css.properties.css.fontface.CssFontVariationSettings fontFaceCssFontVariationSettings;
-    
+
     public CssColorAdjust cssColorAdjust;
     public CssForcedColorAdjust cssForcedColorAdjust;
     public CssColorScheme cssColorScheme;
@@ -670,6 +701,287 @@ public class Css3Style extends ATSCStyle {
     public CssScrollbarWidth cssScrollbarWidth;
     public CssScrollbarColor cssScrollbarColor;
 
+    public CssOverscrollBehaviorX cssOverscrollBehaviorX;
+    public CssOverscrollBehaviorY cssOverscrollBehaviorY;
+    public CssOverscrollBehavior cssOverscrollBehavior;
+    public CssOverscrollBehaviorBlock cssOverscrollBehaviorBlock;
+    public CssOverscrollBehaviorInline cssOverscrollBehaviorInline;
+    public CssContentVisibility cssContentVisibility;
+
+    public CssWordSpaceTransform cssWordSpaceTransform;
+    public CssTextWrapMode cssTextWrapMode;
+    public CssTextWrapStyle cssTextWrapStyle;
+    public CssWrapInside cssWrapInside;
+    public CssWrapAfter cssWrapAfter;
+    public CssWrapBefore cssWrapBefore;
+    public CssTextWrap cssTextWrap;
+    public CssWhiteSpaceCollapse cssWhiteSpaceCollapse;
+    public CssWhiteSpaceTrim cssWhiteSpaceTrim;
+    public CssHyphenateCharacter cssHyphenateCharacter;
+    public CssHyphenateLimitZone cssHyphenateLimitZone;
+    public CssHyphenateLimitChars cssHyphenateLimitChars;
+    public CssHyphenateLimitLines cssHyphenateLimitLines;
+    public CssHyphenateLimitLast cssHyphenateLimitLast;
+    public CssTextGroupAlign cssTextGroupAlign;
+    public CssLinePadding cssLinePadding;
+    public CssTextAutospace cssTextAutospace;
+    public CssTextSpacingTrim cssTextSpacingTrim;
+    public CssTextSpacing cssTextSpacing;
+    public CssTranslate cssTranslate;
+    public CssRotate cssRotate;
+
+    public CssRotate getRotate() {
+        if (cssRotate == null) {
+            cssRotate =
+                    (CssRotate) style.CascadingOrder(new CssRotate(),
+                            style, selector);
+        }
+        return cssRotate;
+    }
+
+    public CssTranslate getTranslate() {
+        if (cssTranslate == null) {
+            cssTranslate =
+                    (CssTranslate) style.CascadingOrder(new CssTranslate(),
+                            style, selector);
+        }
+        return cssTranslate;
+    }
+    
+    public CssScale getScale() {
+        if (cssScale == null) {
+            cssScale =
+                    (CssScale) style.CascadingOrder(new CssScale(),
+                            style, selector);
+        }
+        return cssScale;
+    }
+    
+    public CssTextSpacing getTextSpacing() {
+        if (cssTextSpacing == null) {
+            cssTextSpacing =
+                    (CssTextSpacing) style.CascadingOrder(new CssTextSpacing(),
+                            style, selector);
+        }
+        return cssTextSpacing;
+    }
+
+    public CssTextSpacingTrim getTextSpacingTrim() {
+        if (cssTextSpacingTrim == null) {
+            cssTextSpacingTrim =
+                    (CssTextSpacingTrim) style.CascadingOrder(new CssTextSpacingTrim(),
+                            style, selector);
+        }
+        return cssTextSpacingTrim;
+    }
+    
+    public CssTextAutospace getTextAutospace() {
+        if (cssTextAutospace == null) {
+            cssTextAutospace =
+                    (CssTextAutospace) style.CascadingOrder(new CssTextAutospace(),
+                            style, selector);
+        }
+        return cssTextAutospace;
+    }
+    
+    public CssLinePadding getLinePadding() {
+        if (cssLinePadding == null) {
+            cssLinePadding =
+                    (CssLinePadding) style.CascadingOrder(new CssLinePadding(),
+                            style, selector);
+        }
+        return cssLinePadding;
+    }
+    
+    public CssTextGroupAlign getTextGroupAlign() {
+        if (cssTextGroupAlign == null) {
+            cssTextGroupAlign =
+                    (CssTextGroupAlign) style.CascadingOrder(new CssTextGroupAlign(),
+                            style, selector);
+        }
+        return cssTextGroupAlign;
+    }
+
+    public CssHyphenateLimitLast getHyphenateLimitLast() {
+        if (cssHyphenateLimitLast == null) {
+            cssHyphenateLimitLast =
+                    (CssHyphenateLimitLast) style.CascadingOrder(new CssHyphenateLimitLast(),
+                            style, selector);
+        }
+        return cssHyphenateLimitLast;
+    }
+
+    public CssHyphenateLimitLines getHyphenateLimitLines() {
+        if (cssHyphenateLimitLines == null) {
+            cssHyphenateLimitLines =
+                    (CssHyphenateLimitLines) style.CascadingOrder(new CssHyphenateLimitLines(),
+                            style, selector);
+        }
+        return cssHyphenateLimitLines;
+    }
+
+    public CssHyphenateLimitChars getHyphenateLimitChars() {
+        if (cssHyphenateLimitChars == null) {
+            cssHyphenateLimitChars =
+                    (CssHyphenateLimitChars) style.CascadingOrder(new CssHyphenateLimitChars(),
+                            style, selector);
+        }
+        return cssHyphenateLimitChars;
+    }
+
+    public CssHyphenateLimitZone getHyphenateLimitZone() {
+        if (cssHyphenateLimitZone == null) {
+            cssHyphenateLimitZone =
+                    (CssHyphenateLimitZone) style.CascadingOrder(new CssHyphenateLimitZone(),
+                            style, selector);
+        }
+        return cssHyphenateLimitZone;
+    }
+
+    public CssHyphenateCharacter getHyphenateCharacter() {
+        if (cssHyphenateCharacter == null) {
+            cssHyphenateCharacter =
+                    (CssHyphenateCharacter) style.CascadingOrder(new CssHyphenateCharacter(),
+                            style, selector);
+        }
+        return cssHyphenateCharacter;
+    }
+
+    public CssWhiteSpaceTrim getWhiteSpaceTrim() {
+        if (cssWhiteSpaceTrim == null) {
+            cssWhiteSpaceTrim =
+                    (CssWhiteSpaceTrim) style.CascadingOrder(new CssWhiteSpaceTrim(),
+                            style, selector);
+        }
+        return cssWhiteSpaceTrim;
+    }
+
+    public CssWhiteSpaceCollapse getWhiteSpaceCollapse() {
+        if (cssWhiteSpaceCollapse == null) {
+            cssWhiteSpaceCollapse =
+                    (CssWhiteSpaceCollapse) style.CascadingOrder(new CssWhiteSpaceCollapse(),
+                            style, selector);
+        }
+        return cssWhiteSpaceCollapse;
+    }
+
+    public CssWrapBefore getWrapBefore() {
+        if (cssWrapBefore == null) {
+            cssWrapBefore =
+                    (CssWrapBefore) style.CascadingOrder(new CssWrapBefore(),
+                            style, selector);
+        }
+        return cssWrapBefore;
+    }
+
+    public CssWrapAfter getWrapAfter() {
+        if (cssWrapAfter == null) {
+            cssWrapAfter =
+                    (CssWrapAfter) style.CascadingOrder(new CssWrapAfter(),
+                            style, selector);
+        }
+        return cssWrapAfter;
+    }
+
+    public CssWrapInside getWrapInside() {
+        if (cssWrapInside == null) {
+            cssWrapInside =
+                    (CssWrapInside) style.CascadingOrder(new CssWrapInside(),
+                            style, selector);
+        }
+        return cssWrapInside;
+    }
+
+    public CssTextWrap getTextWrap() {
+        if (cssTextWrap == null) {
+            cssTextWrap =
+                    (CssTextWrap) style.CascadingOrder(new CssTextWrap(),
+                            style, selector);
+        }
+        return cssTextWrap;
+    }
+
+    public CssTextWrapStyle getTextWrapStyle() {
+        if (cssTextWrapStyle == null) {
+            cssTextWrapStyle =
+                    (CssTextWrapStyle) style.CascadingOrder(new CssTextWrapStyle(),
+                            style, selector);
+        }
+        return cssTextWrapStyle;
+    }
+
+    public CssTextWrapMode getTextWrapMode() {
+        if (cssTextWrapMode == null) {
+            cssTextWrapMode =
+                    (CssTextWrapMode) style.CascadingOrder(new CssTextWrapMode(),
+                            style, selector);
+        }
+        return cssTextWrapMode;
+    }
+
+    public CssWordSpaceTransform getWordSpaceTransform() {
+        if (cssWordSpaceTransform == null) {
+            cssWordSpaceTransform =
+                    (CssWordSpaceTransform) style.CascadingOrder(new CssWordSpaceTransform(),
+                            style, selector);
+        }
+        return cssWordSpaceTransform;
+    }
+
+    public CssContentVisibility getContentVisibility() {
+        if (cssContentVisibility == null) {
+            cssContentVisibility =
+                    (CssContentVisibility) style.CascadingOrder(new CssContentVisibility(),
+                            style, selector);
+        }
+        return cssContentVisibility;
+    }
+
+    public CssOverscrollBehavior getOverscrollBehavior() {
+        if (cssOverscrollBehavior == null) {
+            cssOverscrollBehavior =
+                    (CssOverscrollBehavior) style.CascadingOrder(new CssOverscrollBehavior(),
+                            style, selector);
+        }
+        return cssOverscrollBehavior;
+    }
+
+    public CssOverscrollBehaviorX getOverscrollBehaviorX() {
+        if (cssOverscrollBehaviorX == null) {
+            cssOverscrollBehaviorX =
+                    (CssOverscrollBehaviorX) style.CascadingOrder(new CssOverscrollBehaviorX(),
+                            style, selector);
+        }
+        return cssOverscrollBehaviorX;
+    }
+
+    public CssOverscrollBehaviorY getOverscrollBehaviorY() {
+        if (cssOverscrollBehaviorY == null) {
+            cssOverscrollBehaviorY =
+                    (CssOverscrollBehaviorY) style.CascadingOrder(new CssOverscrollBehaviorY(),
+                            style, selector);
+        }
+        return cssOverscrollBehaviorY;
+    }
+
+    public CssOverscrollBehaviorBlock getOverscrollBehaviorBlock() {
+        if (cssOverscrollBehaviorBlock == null) {
+            cssOverscrollBehaviorBlock =
+                    (CssOverscrollBehaviorBlock) style.CascadingOrder(new CssOverscrollBehaviorBlock(),
+                            style, selector);
+        }
+        return cssOverscrollBehaviorBlock;
+    }
+
+    public CssOverscrollBehaviorInline getOverscrollBehaviorInline() {
+        if (cssOverscrollBehaviorInline == null) {
+            cssOverscrollBehaviorInline =
+                    (CssOverscrollBehaviorInline) style.CascadingOrder(new CssOverscrollBehaviorInline(),
+                            style, selector);
+        }
+        return cssOverscrollBehaviorInline;
+    }
+
     public CssScrollbarColor getScrollbarColor() {
         if (cssScrollbarColor == null) {
             cssScrollbarColor =
@@ -1326,7 +1638,7 @@ public org.w3c.css.properties.css.fontface.CssFontVariationSettings getFontFaceC
         }
         return fontFaceCssFontVariationSettings;
     }
-    
+
     public CssUnicodeRange getFontFaceCssUnicodeRange() {
         if (fontFaceCssUnicodeRange == null) {
             fontFaceCssUnicodeRange =
@@ -1344,7 +1656,7 @@ public org.w3c.css.properties.css.fontface.CssFontLanguageOverride getFontFaceCs
         }
         return fontFaceCssFontLanguageOverride;
     }
-    
+
     public CssAscentOverride getFontFaceCssAscentOverride() {
         if (fontFaceCssAscentOverride == null) {
             fontFaceCssAscentOverride =
@@ -1380,7 +1692,7 @@ public CssFontNamedInstance getFontFaceCssFontNamedInstance() {
         }
         return fontFaceCssFontNamedInstance;
     }
-    
+
     public CssFontDisplay getFontFaceCssFontDisplay() {
         if (fontFaceCssFontDisplay == null) {
             fontFaceCssFontDisplay =
@@ -1407,7 +1719,7 @@ public CssFontStyle getFontFaceCssFontStyle() {
         }
         return fontFaceCssFontStyle;
     }
-    
+
     public CssFontWeight getFontFaceCssFontWeight() {
         if (fontFaceCssFontWeight == null) {
             fontFaceCssFontWeight =
@@ -1730,6 +2042,13 @@ public org.w3c.css.properties.css.counterstyle.CssNegative getCounterStyleCssNeg
         return counterStyleCssNegative;
     }
 
+    public CssImageRendering getImageRendering() {
+        if (cssImageRendering == null) {
+            cssImageRendering = (CssImageRendering) style.CascadingOrder(new CssImageRendering(), style, selector);
+        }
+        return cssImageRendering;
+    }
+
     public CssBorderImageSource getBorderImageSource() {
         if (cssBorder.borderImage.source == null) {
             cssBorder.borderImage.source = (CssBorderImageSource) style.CascadingOrder(new CssBorderImageSource(), style, selector);
diff --git a/org/w3c/css/properties/css3/CssAspectRatio.java b/org/w3c/css/properties/css3/CssAspectRatio.java
index f2e96a176..0601df26a 100644
--- a/org/w3c/css/properties/css3/CssAspectRatio.java
+++ b/org/w3c/css/properties/css3/CssAspectRatio.java
@@ -104,7 +104,10 @@ public CssAspectRatio(ApplContext ac, CssExpression expression, boolean check)
             expression.next();
         }
         // if things are not entirely parsed
-        if (v.size() == 0 || (ratio_state != 0 && ratio_state != 3)) {
+        if (ratio_state == 1) {
+            // so we got only one number
+            v.add(new CssRatio(dividend));
+        } else if (v.isEmpty() || (ratio_state != 0 && ratio_state != 3)) {
             throw new InvalidParamException("value",
                     expression.toStringFromStart(),
                     getPropertyName(), ac);
diff --git a/org/w3c/css/properties/css3/CssBackfaceVisibility.java b/org/w3c/css/properties/css3/CssBackfaceVisibility.java
index 48752afac..9897e2983 100644
--- a/org/w3c/css/properties/css3/CssBackfaceVisibility.java
+++ b/org/w3c/css/properties/css3/CssBackfaceVisibility.java
@@ -13,8 +13,7 @@
 import org.w3c.css.values.CssValue;
 
 /**
- * @spec https://www.w3.org/TR/2020/WD-css-transforms-2-20200303/#propdef-backface-visibility
-
+ * @spec https://www.w3.org/TR/2021/WD-css-transforms-2-20211109/#propdef-backface-visibility
  */
 public class CssBackfaceVisibility extends org.w3c.css.properties.css.CssBackfaceVisibility {
 
diff --git a/org/w3c/css/properties/css3/CssColor.java b/org/w3c/css/properties/css3/CssColor.java
index 197863314..a0787917f 100644
--- a/org/w3c/css/properties/css3/CssColor.java
+++ b/org/w3c/css/properties/css3/CssColor.java
@@ -69,7 +69,7 @@ public CssColor(ApplContext ac, CssExpression expression, boolean check)
                 color = val;
                 break;
             case CssTypes.CSS_FUNCTION:
-                CssFunction attr = val.getFunction();
+                 CssFunction attr = val.getFunction();
                 CssExpression params = attr.getParameters();
                 String fname = attr.getName();
 
diff --git a/org/w3c/css/properties/css3/CssContain.java b/org/w3c/css/properties/css3/CssContain.java
index 8a4beed2d..81716f4d5 100644
--- a/org/w3c/css/properties/css3/CssContain.java
+++ b/org/w3c/css/properties/css3/CssContain.java
@@ -19,12 +19,15 @@
 
 /**
  * @spec https://www.w3.org/TR/2020/WD-css-contain-2-20201216/#propdef-contain
+ * @spec https://www.w3.org/TR/2022/WD-css-contain-3-20220818/#contain-property
  */
 public class CssContain extends org.w3c.css.properties.css.CssContain {
 
     public static final CssIdent[] allowed_single_values;
     public static final CssIdent[] allowed_multiple_values;
     public static final CssIdent auto = CssIdent.getIdent("auto");
+    public static final CssIdent size = CssIdent.getIdent("size");
+    public static final CssIdent inline_size = CssIdent.getIdent("inline-size");
 
     static {
         String[] _allowed_single_values = {"none", "strict", "content"};
@@ -34,7 +37,7 @@ public class CssContain extends org.w3c.css.properties.css.CssContain {
             allowed_single_values[i++] = CssIdent.getIdent(s);
         }
         // "style" added as of css-contain-2 but at-risk
-        String[] _allowed_multiple_values = {"size", "layout", "paint", "style"};
+        String[] _allowed_multiple_values = {"size", "inline-size", "layout", "paint", "style"};
         i = 0;
         allowed_multiple_values = new CssIdent[_allowed_multiple_values.length];
         for (String s : _allowed_multiple_values) {
@@ -60,6 +63,10 @@ public static CssIdent getAllowedMultipleIdent(CssIdent ident) {
         return null;
     }
 
+    public static boolean isExclusiveIdent(CssIdent ident) {
+        return (size.equals(ident) || inline_size.equals(ident));
+    }
+
     /**
      * Create a new CssContain
      */
@@ -79,6 +86,7 @@ public CssContain(ApplContext ac, CssExpression expression, boolean check)
         char op;
         CssIdent id, ident;
         boolean got_single = false;
+        boolean got_exclusive = false;
 
         setByUser();
 
@@ -129,6 +137,15 @@ public CssContain(ApplContext ac, CssExpression expression, boolean check)
                         expression.getValue(),
                         getPropertyName(), ac);
             }
+            if (isExclusiveIdent(ident)) {
+                if (got_exclusive) {
+                    throw new InvalidParamException("value",
+                            expression.getValue(),
+                            getPropertyName(), ac);
+                } else {
+                    got_exclusive = true;
+                }
+            }
             idvalues.add(ident);
             values.add(val);
             if (op != SPACE) {
diff --git a/org/w3c/css/properties/css3/CssContent.java b/org/w3c/css/properties/css3/CssContent.java
index 2ab3d5f28..92b0199b1 100644
--- a/org/w3c/css/properties/css3/CssContent.java
+++ b/org/w3c/css/properties/css3/CssContent.java
@@ -261,9 +261,16 @@ protected static void checkCounterFunction(ApplContext ac,
             v = exp.getValue();
             if (v.getType() == CssTypes.CSS_IDENT) {
                 if (null == CssListStyleType.getAllowedIdent(v.getIdent())) {
-                    throw new InvalidParamException("value", v,
-                            property.getPropertyName(), ac);
+                    // here we should check existing name counter-style.
+                    // and release a warning if not
+                    // we should first add a warning here to highlight the issue
+                    // (non-existent style should behave like decimal)
+                    // throw new InvalidParamException("value", v,
+                    //                                  property.getPropertyName(), ac);
                 }
+            } else {
+                throw new InvalidParamException("value", v,
+                        property.getPropertyName(), ac);
             }
         }
     }
diff --git a/org/w3c/css/properties/css3/CssContentVisibility.java b/org/w3c/css/properties/css3/CssContentVisibility.java
new file mode 100644
index 000000000..abf031cfd
--- /dev/null
+++ b/org/w3c/css/properties/css3/CssContentVisibility.java
@@ -0,0 +1,81 @@
+//
+// Author: Yves Lafon 
+//
+// (c) COPYRIGHT MIT, ERCIM, Keio, Beihang, 2022.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.properties.css3;
+
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
+import org.w3c.css.values.CssTypes;
+import org.w3c.css.values.CssValue;
+
+/**
+ * @spec https://www.w3.org/TR/2020/WD-css-contain-2-20201216/#propdef-content-visibility
+ */
+public class CssContentVisibility extends org.w3c.css.properties.css.CssContentVisibility {
+
+    public static final CssIdent[] allowed_values;
+
+    static {
+        String[] _allowed_values = {"visible", "auto", "hidden"};
+        allowed_values = new CssIdent[_allowed_values.length];
+        int i = 0;
+        for (String s : _allowed_values) {
+            allowed_values[i++] = CssIdent.getIdent(s);
+        }
+    }
+
+    public static CssIdent getAllowedIdent(CssIdent ident) {
+        for (CssIdent id : allowed_values) {
+            if (id.equals(ident)) {
+                return id;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Create a new CssContentVisibility
+     */
+    public CssContentVisibility() {
+        value = initial;
+    }
+
+    /**
+     * Creates a new CssContentVisibility
+     *
+     * @param expression The expression for this property
+     * @throws InvalidParamException Expressions are incorrect
+     */
+    public CssContentVisibility(ApplContext ac, CssExpression expression, boolean check)
+            throws InvalidParamException {
+
+        if (check && expression.getCount() > 1) {
+            throw new InvalidParamException("unrecognize", ac);
+        }
+
+        CssValue val = expression.getValue();
+
+        setByUser();
+        if (val.getType() != CssTypes.CSS_IDENT) {
+            throw new InvalidParamException("value", expression.getValue(),
+                    getPropertyName(), ac);
+        }
+        CssIdent id = val.getIdent();
+        if (!CssIdent.isCssWide(id) && (getAllowedIdent(id) == null)) {
+            throw new InvalidParamException("value", expression.getValue(),
+                    getPropertyName(), ac);
+        }
+        value = val;
+        expression.next();
+    }
+
+    public CssContentVisibility(ApplContext ac, CssExpression expression)
+            throws InvalidParamException {
+        this(ac, expression, false);
+    }
+}
+
diff --git a/org/w3c/css/properties/css3/CssFilter.java b/org/w3c/css/properties/css3/CssFilter.java
index 2e29ac060..bff8048d5 100644
--- a/org/w3c/css/properties/css3/CssFilter.java
+++ b/org/w3c/css/properties/css3/CssFilter.java
@@ -163,7 +163,7 @@ protected static void parseFunctionValues(ApplContext ac, CssValue func, String
             case opacity:
             case saturate:
             case sepia:
-                parseOneNonNegativeNumPercent(ac, function.getParameters(), caller);
+                parseAtMostOneNonNegativeNumPercent(ac, function.getParameters(), caller);
                 break;
             case drop_shadow:
                 parseDropShadowFunction(ac, function.getParameters(), caller);
@@ -206,12 +206,16 @@ private static void parseOneX(ApplContext ac, CssExpression expression,
     }
 
     // parse one value of type (CssTypes.XXX)
-    private static void parseOneNonNegativeNumPercent(ApplContext ac, CssExpression expression,
+    private static void parseAtMostOneNonNegativeNumPercent(ApplContext ac, CssExpression expression,
                                                       String caller)
             throws InvalidParamException {
         if (expression.getCount() > 1) {
             throw new InvalidParamException("unrecognize", ac);
         }
+        // empty? -> OK
+        if (expression.getCount() == 0) {
+            return;
+        }
         CssValue val = expression.getValue();
         char op = expression.getOperator();
 
diff --git a/org/w3c/css/properties/css3/CssFloat.java b/org/w3c/css/properties/css3/CssFloat.java
index 7479eb6ff..55d6f6a35 100644
--- a/org/w3c/css/properties/css3/CssFloat.java
+++ b/org/w3c/css/properties/css3/CssFloat.java
@@ -20,7 +20,7 @@ public class CssFloat extends org.w3c.css.properties.css.CssFloat {
     public static final CssIdent[] allowed_values;
 
     static {
-        String[] _allowed_values = {"both", "left", "right", "none",
+        String[] _allowed_values = {"left", "right", "none",
                 "inline-start", "inline-end"};
         int i = 0;
         allowed_values = new CssIdent[_allowed_values.length];
diff --git a/org/w3c/css/properties/css3/CssFontSizeAdjust.java b/org/w3c/css/properties/css3/CssFontSizeAdjust.java
index 25489b2d5..b4f28689b 100644
--- a/org/w3c/css/properties/css3/CssFontSizeAdjust.java
+++ b/org/w3c/css/properties/css3/CssFontSizeAdjust.java
@@ -11,15 +11,40 @@
 import org.w3c.css.values.CssIdent;
 import org.w3c.css.values.CssTypes;
 import org.w3c.css.values.CssValue;
+import org.w3c.css.values.CssValueList;
+
+import static org.w3c.css.values.CssOperator.SPACE;
 
 /**
- * @spec https://www.w3.org/TR/2021/WD-css-fonts-4-20210729/#propdef-font-size-adjust
+ * @spec https://www.w3.org/TR/2024/WD-css-fonts-5-20240206/#propdef-font-size-adjust
  */
 public class CssFontSizeAdjust extends org.w3c.css.properties.css.CssFontSizeAdjust {
 
+    public static final CssIdent[] optionalIdentValues;
+    public static final CssIdent from_font;
+
+    static {
+        String[] _optionalIdentValues = {"ex-height", "cap-height", "ch-width",
+                "ic-width", "ic-height"};
+        optionalIdentValues = new CssIdent[_optionalIdentValues.length];
+        for (int i = 0; i < optionalIdentValues.length; i++) {
+            optionalIdentValues[i] = CssIdent.getIdent(_optionalIdentValues[i]);
+        }
+        from_font = CssIdent.getIdent("from-font");
+    }
+
+    public static final CssIdent getOptionalIdent(CssIdent ident) {
+        for (CssIdent id : optionalIdentValues) {
+            if (id.equals(ident)) {
+                return id;
+            }
+        }
+        return null;
+    }
+
     public static final CssIdent getAllowedIdent(CssIdent ident) {
-        if (none.equals(ident)) {
-            return none;
+        if (from_font.equals(ident)) {
+            return from_font;
         }
         return null;
     }
@@ -39,37 +64,74 @@ public CssFontSizeAdjust() {
      */
     public CssFontSizeAdjust(ApplContext ac, CssExpression expression, boolean check)
             throws InvalidParamException {
-        if (check && expression.getCount() > 1) {
+        if (check && expression.getCount() > 2) {
             throw new InvalidParamException("unrecognize", ac);
         }
 
         setByUser();
 
         CssValue val;
+        CssValueList vl = null;
         char op;
+        boolean got_option = false;
+        
+        while (!expression.end()) {
+            val = expression.getValue();
+            op = expression.getOperator();
 
-        val = expression.getValue();
-        op = expression.getOperator();
-
-        switch (val.getType()) {
-            case CssTypes.CSS_IDENT:
-                CssIdent id = val.getIdent();
-                if (CssIdent.isCssWide(id) || (getAllowedIdent(id) != null)) {
-                    value = val;
+            switch (val.getType()) {
+                case CssTypes.CSS_IDENT:
+                    CssIdent id = val.getIdent();
+                    if (expression.getCount() == 1) {
+                        if (CssIdent.isCssWide(id) || (getAllowedIdent(id) != null) || none.equals(id)) {
+                            value = val;
+                            break;
+                        }
+                        throw new InvalidParamException("value",
+                                val, getPropertyName(), ac);
+                    } else {
+                        if (!got_option) {
+                            got_option = (getOptionalIdent(id) != null);
+                            if (got_option) {
+                                vl = new CssValueList();
+                                vl.add(val);
+                            } else {
+                                throw new InvalidParamException("value",
+                                        val, getPropertyName(), ac);
+                            }
+                        } else {
+                            // got_option is true, so vl was created
+                            if (getAllowedIdent(id) != null) {
+                                vl.add(val);
+                            } else {
+                                throw new InvalidParamException("value",
+                                        val, getPropertyName(), ac);
+                            }
+                        }
+                    }
                     break;
-                }
-                throw new InvalidParamException("value",
-                        val, getPropertyName(), ac);
-            case CssTypes.CSS_NUMBER:
-                val.getCheckableValue().checkPositiveness(ac, getPropertyName());
-                value = val;
-                break;
-            default:
-                throw new InvalidParamException("value",
-                        val, getPropertyName(), ac);
+                case CssTypes.CSS_NUMBER:
+                    val.getCheckableValue().checkPositiveness(ac, getPropertyName());
+                    if (got_option) {
+                        vl.add(val);
+                    } else {
+                        value = val;
+                    }
+                    break;
+                default:
+                    throw new InvalidParamException("value",
+                            val, getPropertyName(), ac);
+            }
+            if (op != SPACE) {
+                throw new InvalidParamException("operator", op,
+                        getPropertyName(), ac);
+            }
+            expression.next();
+        }
+        // reassign if we got multiple values
+        if (got_option) {
+            value = vl;
         }
-        expression.next();
-
     }
 
     public CssFontSizeAdjust(ApplContext ac, CssExpression expression)
diff --git a/org/w3c/css/properties/css3/CssFontVariant.java b/org/w3c/css/properties/css3/CssFontVariant.java
index e9b424038..48541779f 100644
--- a/org/w3c/css/properties/css3/CssFontVariant.java
+++ b/org/w3c/css/properties/css3/CssFontVariant.java
@@ -41,6 +41,7 @@ public class CssFontVariant extends org.w3c.css.properties.css.CssFontVariant {
     CssFontVariantEastAsian asiValue = null;
     CssFontVariantLigatures ligValue = null;
     CssFontVariantNumeric numValue = null;
+    CssFontVariantPosition posValue = null;
 
     /**
      * Creates a new CssFontVariant
@@ -63,6 +64,7 @@ public CssFontVariant(ApplContext ac, CssExpression expression, boolean check)
         CssExpression capExp = null;
         CssExpression numExp = null;
         CssExpression asiExp = null;
+        CssExpression posExp = null;
 
         while (!expression.end()) {
             val = expression.getValue();
@@ -138,6 +140,13 @@ public CssFontVariant(ApplContext ac, CssExpression expression, boolean check)
                             asiExp.addValue(id);
                             break;
                         }
+                        if (CssFontVariantPosition.getAllowedValue(id) != null) {
+                            if (posExp == null) {
+                                posExp = new CssExpression();
+                            }
+                            posExp.addValue(id);
+                            break;
+                        }
                         if (CssFontVariantAlternates.getAllowedIdent(id) != null) {
                             if (altExp == null) {
                                 altExp = new CssExpression();
@@ -165,6 +174,7 @@ public CssFontVariant(ApplContext ac, CssExpression expression, boolean check)
             CssFontVariantEastAsian asiValue = null;
             CssFontVariantLigatures ligValue = null;
             CssFontVariantNumeric numValue = null;
+            CssFontVariantPosition posValue = null;
             ArrayList vlist = new ArrayList(5);
             if (altExp != null) {
                 altValue = new CssFontVariantAlternates(ac, altExp, check);
@@ -182,6 +192,10 @@ public CssFontVariant(ApplContext ac, CssExpression expression, boolean check)
                 ligValue = new CssFontVariantLigatures(ac, ligExp, check);
                 vlist.add(ligValue.value);
             }
+            if (posExp != null) {
+                posValue = new CssFontVariantPosition(ac, posExp, check);
+                vlist.add(posValue.value);
+            }
             if (numExp != null) {
                 numValue = new CssFontVariantNumeric(ac, numExp, check);
                 vlist.add(numValue.value);
@@ -221,6 +235,9 @@ public void addToStyle(ApplContext ac, CssStyle style) {
         if (numValue != null) {
             numValue.addToStyle(ac, style);
         }
+        if (posValue != null) {
+            posValue.addToStyle(ac, style);
+        }
     }
 }
 
diff --git a/org/w3c/css/properties/css3/CssHangingPunctuation.java b/org/w3c/css/properties/css3/CssHangingPunctuation.java
index 759c2e98b..d45e95492 100644
--- a/org/w3c/css/properties/css3/CssHangingPunctuation.java
+++ b/org/w3c/css/properties/css3/CssHangingPunctuation.java
@@ -17,7 +17,7 @@
 import java.util.ArrayList;
 
 /**
- * @spec https://www.w3.org/TR/2021/CRD-css-text-3-20210422/#propdef-hanging-punctuation
+ * @spec https://www.w3.org/TR/2024/WD-css-text-4-20240219/#propdef-hanging-punctuation
  */
 public class CssHangingPunctuation extends org.w3c.css.properties.css.CssHangingPunctuation {
 
diff --git a/org/w3c/css/properties/css3/CssHyphenateCharacter.java b/org/w3c/css/properties/css3/CssHyphenateCharacter.java
new file mode 100644
index 000000000..06223476d
--- /dev/null
+++ b/org/w3c/css/properties/css3/CssHyphenateCharacter.java
@@ -0,0 +1,95 @@
+//
+// Author: Yves Lafon 
+//
+// (c) COPYRIGHT World Wide Web Consortium, 2024.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.properties.css3;
+
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
+import org.w3c.css.values.CssTypes;
+import org.w3c.css.values.CssValue;
+
+/**
+ * @spec https://www.w3.org/TR/2024/WD-css-text-4-20240219/#propdef-hyphenate-character
+ */
+public class CssHyphenateCharacter extends org.w3c.css.properties.css.CssHyphenateCharacter {
+
+    private final static CssIdent[] allowed_values;
+
+    static {
+        String[] id_values = {"auto"};
+        allowed_values = new CssIdent[id_values.length];
+        int i = 0;
+        for (String s : id_values) {
+            allowed_values[i++] = CssIdent.getIdent(s);
+        }
+    }
+
+    public static CssIdent getAllowedIdent(CssIdent ident) {
+        for (CssIdent id : allowed_values) {
+            if (id.equals(ident)) {
+                return id;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Create a new CssHyphenateCharacter
+     */
+    public CssHyphenateCharacter() {
+        value = initial;
+    }
+
+    /**
+     * Creates a new CssHyphenateCharacter
+     *
+     * @param expression The expression for this property
+     * @throws InvalidParamException Expressions are incorrect
+     */
+    public CssHyphenateCharacter(ApplContext ac, CssExpression expression, boolean check)
+            throws InvalidParamException {
+        setByUser();
+
+        if (check && expression.getCount() > 1) {
+            throw new InvalidParamException("unrecognize", ac);
+        }
+
+        CssValue val = expression.getValue();
+
+        switch (val.getType()) {
+            case CssTypes.CSS_IDENT:
+                CssIdent ident = val.getIdent();
+                if (CssIdent.isCssWide(ident)) {
+                    value = val;
+                    break;
+                }
+                if (getAllowedIdent(ident) != null) {
+                    value = val;
+                    break;
+                }
+                throw new InvalidParamException("value",
+                        expression.getValue(),
+                        getPropertyName(), ac);
+            case CssTypes.CSS_STRING:
+                value = val;
+                break;
+            default:
+                throw new InvalidParamException("value",
+                        expression.getValue(),
+                        getPropertyName(), ac);
+
+        }
+        expression.next();
+    }
+
+    public CssHyphenateCharacter(ApplContext ac, CssExpression expression)
+            throws InvalidParamException {
+        this(ac, expression, false);
+    }
+
+}
+
diff --git a/org/w3c/css/properties/css3/CssHyphenateLimitChars.java b/org/w3c/css/properties/css3/CssHyphenateLimitChars.java
new file mode 100644
index 000000000..dd5552f99
--- /dev/null
+++ b/org/w3c/css/properties/css3/CssHyphenateLimitChars.java
@@ -0,0 +1,117 @@
+//
+// Author: Yves Lafon 
+//
+// (c) COPYRIGHT World Wide Web Consortium, 2024.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.properties.css3;
+
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
+import org.w3c.css.values.CssTypes;
+import org.w3c.css.values.CssValue;
+import org.w3c.css.values.CssValueList;
+
+import java.util.ArrayList;
+
+import static org.w3c.css.values.CssOperator.SPACE;
+
+/**
+ * @spec https://www.w3.org/TR/2024/WD-css-text-4-20240219/#propdef-hyphenate-limit-chars
+ */
+public class CssHyphenateLimitChars extends org.w3c.css.properties.css.CssHyphenateLimitChars {
+
+    private final static CssIdent[] allowed_values;
+
+    static {
+        String[] id_values = {"auto"};
+        allowed_values = new CssIdent[id_values.length];
+        int i = 0;
+        for (String s : id_values) {
+            allowed_values[i++] = CssIdent.getIdent(s);
+        }
+    }
+
+    public static CssIdent getAllowedIdent(CssIdent ident) {
+        for (CssIdent id : allowed_values) {
+            if (id.equals(ident)) {
+                return id;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Create a new CssHyphenateLimitChars
+     */
+    public CssHyphenateLimitChars() {
+        value = initial;
+    }
+
+    /**
+     * Creates a new CssHyphenateLimitChars
+     *
+     * @param expression The expression for this property
+     * @throws InvalidParamException Expressions are incorrect
+     */
+    public CssHyphenateLimitChars(ApplContext ac, CssExpression expression, boolean check)
+            throws InvalidParamException {
+        ArrayList values = new ArrayList();
+        CssValue val;
+        CssIdent id;
+        char op;
+
+        setByUser();
+
+        if (check && expression.getCount() > 3) {
+            throw new InvalidParamException("unrecognize", ac);
+        }
+
+        while (!expression.end()) {
+            val = expression.getValue();
+            op = expression.getOperator();
+
+            switch (val.getType()) {
+                case CssTypes.CSS_IDENT:
+                    if (CssIdent.isCssWide(val.getIdent())) {
+                        if (expression.getCount() > 1) {
+                            throw new InvalidParamException("value",
+                                    expression.getValue(),
+                                    getPropertyName(), ac);
+                        }
+                        values.add(val);
+                        break;
+                    }
+                    if (getAllowedIdent(val.getIdent()) != null) {
+                        values.add(val);
+                        break;
+                    }
+                    throw new InvalidParamException("value",
+                            expression.getValue(),
+                            getPropertyName(), ac);
+                case CssTypes.CSS_NUMBER:
+                    val.getCheckableValue().checkInteger(ac, this);
+                    values.add(val);
+                    break;
+                default:
+                    throw new InvalidParamException("value",
+                            expression.getValue(),
+                            getPropertyName(), ac);
+            }
+            if (op != SPACE) {
+                throw new InvalidParamException("operator", op,
+                        getPropertyName(), ac);
+            }
+            expression.next();
+        }
+        value = (values.size() == 1) ? values.get(0) : new CssValueList(values);
+    }
+
+    public CssHyphenateLimitChars(ApplContext ac, CssExpression expression)
+            throws InvalidParamException {
+        this(ac, expression, false);
+    }
+
+}
+
diff --git a/org/w3c/css/properties/css3/CssHyphenateLimitLast.java b/org/w3c/css/properties/css3/CssHyphenateLimitLast.java
new file mode 100644
index 000000000..4da47dd1b
--- /dev/null
+++ b/org/w3c/css/properties/css3/CssHyphenateLimitLast.java
@@ -0,0 +1,87 @@
+//
+// Author: Yves Lafon 
+//
+// (c) COPYRIGHT World Wide Web Consortium, 2024.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.properties.css3;
+
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
+import org.w3c.css.values.CssTypes;
+import org.w3c.css.values.CssValue;
+
+/**
+ * @spec https://www.w3.org/TR/2024/WD-css-text-4-20240219/#propdef-hyphenate-limit-zone
+ */
+public class CssHyphenateLimitLast extends org.w3c.css.properties.css.CssHyphenateLimitZone {
+    private final static CssIdent[] allowed_values;
+
+    static {
+        String[] id_values = {"none", "always", "column", "page", "spread"};
+        allowed_values = new CssIdent[id_values.length];
+        int i = 0;
+        for (String s : id_values) {
+            allowed_values[i++] = CssIdent.getIdent(s);
+        }
+    }
+
+    public static CssIdent getAllowedIdent(CssIdent ident) {
+        for (CssIdent id : allowed_values) {
+            if (id.equals(ident)) {
+                return id;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Create a new CssHyphenateLimitZone
+     */
+    public CssHyphenateLimitLast() {
+        value = initial;
+    }
+
+    /**
+     * Creates a new CssHyphenateLimitZone
+     *
+     * @param expression The expression for this property
+     * @throws InvalidParamException Expressions are incorrect
+     */
+    public CssHyphenateLimitLast(ApplContext ac, CssExpression expression, boolean check)
+            throws InvalidParamException {
+        setByUser();
+
+        if (check && expression.getCount() > 1) {
+            throw new InvalidParamException("unrecognize", ac);
+        }
+
+        CssValue val = expression.getValue();
+
+        if (val.getType() != CssTypes.CSS_IDENT) {
+            throw new InvalidParamException("value",
+                    expression.getValue(),
+                    getPropertyName(), ac);
+        }
+
+        CssIdent ident = val.getIdent();
+        if (CssIdent.isCssWide(ident)) {
+            value = val;
+        } else if (getAllowedIdent(ident) != null) {
+            value = val;
+        } else {
+            throw new InvalidParamException("value",
+                    expression.getValue(),
+                    getPropertyName(), ac);
+        }
+        expression.next();
+    }
+
+    public CssHyphenateLimitLast(ApplContext ac, CssExpression expression)
+            throws InvalidParamException {
+        this(ac, expression, false);
+    }
+
+}
+
diff --git a/org/w3c/css/properties/css3/CssHyphenateLimitLines.java b/org/w3c/css/properties/css3/CssHyphenateLimitLines.java
new file mode 100644
index 000000000..1b6cc6d35
--- /dev/null
+++ b/org/w3c/css/properties/css3/CssHyphenateLimitLines.java
@@ -0,0 +1,97 @@
+//
+// Author: Yves Lafon 
+//
+// (c) COPYRIGHT World Wide Web Consortium, 2024.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.properties.css3;
+
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssCheckableValue;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
+import org.w3c.css.values.CssTypes;
+import org.w3c.css.values.CssValue;
+
+/**
+ * @spec https://www.w3.org/TR/2024/WD-css-text-4-20240219/#propdef-hyphenate-limit-lines
+ */
+public class CssHyphenateLimitLines extends org.w3c.css.properties.css.CssHyphenateLimitLines {
+    private final static CssIdent[] allowed_values;
+
+    static {
+        String[] id_values = {"no-limit"};
+        allowed_values = new CssIdent[id_values.length];
+        int i = 0;
+        for (String s : id_values) {
+            allowed_values[i++] = CssIdent.getIdent(s);
+        }
+    }
+
+    public static CssIdent getAllowedIdent(CssIdent ident) {
+        for (CssIdent id : allowed_values) {
+            if (id.equals(ident)) {
+                return id;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Create a new CssHyphenateLimitLines
+     */
+    public CssHyphenateLimitLines() {
+        value = initial;
+    }
+
+    /**
+     * Creates a new CssHyphenateLimitLines
+     *
+     * @param expression The expression for this property
+     * @throws InvalidParamException Expressions are incorrect
+     */
+    public CssHyphenateLimitLines(ApplContext ac, CssExpression expression, boolean check)
+            throws InvalidParamException {
+        setByUser();
+
+        if (check && expression.getCount() > 1) {
+            throw new InvalidParamException("unrecognize", ac);
+        }
+
+        CssValue val = expression.getValue();
+
+        switch (val.getType()) {
+            case CssTypes.CSS_IDENT:
+                CssIdent ident = val.getIdent();
+                if (CssIdent.isCssWide(ident)) {
+                    value = val;
+                    break;
+                }
+                if (getAllowedIdent(val.getIdent()) != null) {
+                    value = val;
+                    break;
+                }
+                throw new InvalidParamException("value",
+                        expression.getValue(),
+                        getPropertyName(), ac);
+            case CssTypes.CSS_NUMBER:
+                CssCheckableValue p = val.getCheckableValue();
+                p.checkInteger(ac, this);
+                value = val;
+                break;
+            default:
+                throw new InvalidParamException("value",
+                        expression.getValue(),
+                        getPropertyName(), ac);
+
+        }
+        expression.next();
+    }
+
+    public CssHyphenateLimitLines(ApplContext ac, CssExpression expression)
+            throws InvalidParamException {
+        this(ac, expression, false);
+    }
+
+}
+
diff --git a/org/w3c/css/properties/css3/CssHyphenateLimitZone.java b/org/w3c/css/properties/css3/CssHyphenateLimitZone.java
new file mode 100644
index 000000000..ae17363e2
--- /dev/null
+++ b/org/w3c/css/properties/css3/CssHyphenateLimitZone.java
@@ -0,0 +1,77 @@
+//
+// Author: Yves Lafon 
+//
+// (c) COPYRIGHT World Wide Web Consortium, 2024.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.properties.css3;
+
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssCheckableValue;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
+import org.w3c.css.values.CssTypes;
+import org.w3c.css.values.CssValue;
+
+/**
+ * @spec https://www.w3.org/TR/2024/WD-css-text-4-20240219/#propdef-hyphenate-limit-zone
+ */
+public class CssHyphenateLimitZone extends org.w3c.css.properties.css.CssHyphenateLimitZone {
+
+    /**
+     * Create a new CssHyphenateLimitZone
+     */
+    public CssHyphenateLimitZone() {
+        value = initial;
+    }
+
+    /**
+     * Creates a new CssHyphenateLimitZone
+     *
+     * @param expression The expression for this property
+     * @throws InvalidParamException Expressions are incorrect
+     */
+    public CssHyphenateLimitZone(ApplContext ac, CssExpression expression, boolean check)
+            throws InvalidParamException {
+        setByUser();
+
+        if (check && expression.getCount() > 1) {
+            throw new InvalidParamException("unrecognize", ac);
+        }
+
+        CssValue val = expression.getValue();
+
+        switch (val.getType()) {
+            case CssTypes.CSS_IDENT:
+                CssIdent ident = val.getIdent();
+                if (CssIdent.isCssWide(ident)) {
+                    value = val;
+                    break;
+                }
+                throw new InvalidParamException("value",
+                        expression.getValue(),
+                        getPropertyName(), ac);
+            case CssTypes.CSS_NUMBER:
+                CssCheckableValue p = val.getCheckableValue();
+                p.checkEqualsZero(ac, this);
+                // flow for other possible checks
+            case CssTypes.CSS_LENGTH:
+            case CssTypes.CSS_PERCENTAGE:
+                value = val;
+                break;
+            default:
+                throw new InvalidParamException("value",
+                        expression.getValue(),
+                        getPropertyName(), ac);
+
+        }
+        expression.next();
+    }
+
+    public CssHyphenateLimitZone(ApplContext ac, CssExpression expression)
+            throws InvalidParamException {
+        this(ac, expression, false);
+    }
+
+}
+
diff --git a/org/w3c/css/properties/css3/CssHyphens.java b/org/w3c/css/properties/css3/CssHyphens.java
index 71dfca0b3..aade15b6e 100644
--- a/org/w3c/css/properties/css3/CssHyphens.java
+++ b/org/w3c/css/properties/css3/CssHyphens.java
@@ -13,7 +13,7 @@
 import org.w3c.css.values.CssValue;
 
 /**
- * @pec https://www.w3.org/TR/2021/CRD-css-text-3-20210422/#propdef-hyphens
+ * @pec https://www.w3.org/TR/2024/WD-css-text-4-20240219/#propdef-hyphens
  */
 public class CssHyphens extends org.w3c.css.properties.css.CssHyphens {
 
diff --git a/org/w3c/css/properties/css3/CssLetterSpacing.java b/org/w3c/css/properties/css3/CssLetterSpacing.java
index a1a24266d..06cfadfc7 100644
--- a/org/w3c/css/properties/css3/CssLetterSpacing.java
+++ b/org/w3c/css/properties/css3/CssLetterSpacing.java
@@ -13,7 +13,7 @@
 import org.w3c.css.values.CssValue;
 
 /**
- * @spec https://www.w3.org/TR/2018/WD-css-text-3-20181212/#propdef-letter-spacing
+ * @spec https://www.w3.org/TR/2024/WD-css-text-4-20240219/#propdef-letter-spacing
  */
 public class CssLetterSpacing extends org.w3c.css.properties.css.CssLetterSpacing {
 
diff --git a/org/w3c/css/properties/css3/CssLineBreak.java b/org/w3c/css/properties/css3/CssLineBreak.java
index b6fcb01fb..dc354bcd9 100644
--- a/org/w3c/css/properties/css3/CssLineBreak.java
+++ b/org/w3c/css/properties/css3/CssLineBreak.java
@@ -13,7 +13,7 @@
 import org.w3c.css.values.CssValue;
 
 /**
- * @spec https://www.w3.org/TR/2021/CRD-css-text-3-20210422/#propdef-line-break
+ * @spec https://www.w3.org/TR/2024/WD-css-text-4-20240219/#propdef-line-break
  */
 public class CssLineBreak extends org.w3c.css.properties.css.CssLineBreak {
 
@@ -48,8 +48,7 @@ public CssLineBreak() {
      * Creates a new CssLineBreak
      *
      * @param expression The expression for this property
-     * @throws org.w3c.css.util.InvalidParamException
-     *          Expressions are incorrect
+     * @throws org.w3c.css.util.InvalidParamException Expressions are incorrect
      */
     public CssLineBreak(ApplContext ac, CssExpression expression, boolean check)
             throws InvalidParamException {
diff --git a/org/w3c/css/properties/css3/CssLinePadding.java b/org/w3c/css/properties/css3/CssLinePadding.java
new file mode 100644
index 000000000..fd6b26df7
--- /dev/null
+++ b/org/w3c/css/properties/css3/CssLinePadding.java
@@ -0,0 +1,70 @@
+//
+// Author: Yves Lafon 
+//
+// (c) COPYRIGHT World Wide Web Consortium, 2024.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.properties.css3;
+
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
+import org.w3c.css.values.CssTypes;
+import org.w3c.css.values.CssValue;
+
+/**
+ * @spec https://www.w3.org/TR/2024/WD-css-text-4-20240219/#propdef-line-padding
+ */
+public class CssLinePadding extends org.w3c.css.properties.css.CssLinePadding {
+
+    /**
+     * Create a new CssLinePadding
+     */
+    public CssLinePadding() {
+        value = initial;
+    }
+
+    /**
+     * Creates a new CssLinePadding
+     *
+     * @param expression The expression for this property
+     * @throws InvalidParamException Expressions are incorrect
+     */
+    public CssLinePadding(ApplContext ac, CssExpression expression, boolean check)
+            throws InvalidParamException {
+        setByUser();
+        CssValue val = expression.getValue();
+
+        if (check && expression.getCount() > 1) {
+            throw new InvalidParamException("unrecognize", ac);
+        }
+
+        switch (val.getType()) {
+            case CssTypes.CSS_IDENT:
+                if (CssIdent.isCssWide(val.getIdent())) {
+                    value = val;
+                    break;
+                }
+                throw new InvalidParamException("value",
+                        expression.getValue(),
+                        getPropertyName(), ac);
+            case CssTypes.CSS_NUMBER:
+                val.getCheckableValue().checkEqualsZero(ac, this);
+            case CssTypes.CSS_LENGTH:
+                value = val;
+                break;
+            default:
+                throw new InvalidParamException("value",
+                        expression.getValue(),
+                        getPropertyName(), ac);
+        }
+        expression.next();
+    }
+
+    public CssLinePadding(ApplContext ac, CssExpression expression)
+            throws InvalidParamException {
+        this(ac, expression, false);
+    }
+
+}
+
diff --git a/org/w3c/css/properties/css3/CssOverflowWrap.java b/org/w3c/css/properties/css3/CssOverflowWrap.java
index e6b2ed3e9..046cc46b3 100644
--- a/org/w3c/css/properties/css3/CssOverflowWrap.java
+++ b/org/w3c/css/properties/css3/CssOverflowWrap.java
@@ -13,7 +13,7 @@
 import org.w3c.css.values.CssValue;
 
 /**
- * @spec https://www.w3.org/TR/2021/CRD-css-text-3-20210422/#propdef-overflow-wrap
+ * @spec https://www.w3.org/TR/2024/WD-css-text-4-20240219/#propdef-overflow-wrap
  * 

  * Note that word-wrap is also an alias for this.
  */
diff --git a/org/w3c/css/properties/css3/CssOverscrollBehavior.java b/org/w3c/css/properties/css3/CssOverscrollBehavior.java
new file mode 100644
index 000000000..0a59a5a11
--- /dev/null
+++ b/org/w3c/css/properties/css3/CssOverscrollBehavior.java
@@ -0,0 +1,195 @@
+// $Id$
+// Author: Yves Lafon 
+//
+// (c) COPYRIGHT MIT, ERCIM and Keio University, 2012.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.properties.css3;
+
+import org.w3c.css.parser.CssSelectors;
+import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
+import org.w3c.css.values.CssTypes;
+import org.w3c.css.values.CssValue;
+import org.w3c.css.values.CssValueList;
+
+import java.util.ArrayList;
+
+import static org.w3c.css.values.CssOperator.SPACE;
+
+/**
+ * @spec https://www.w3.org/TR/2019/WD-css-overscroll-1-20190606/#propdef-overscroll-behavior
+ */
+public class CssOverscrollBehavior extends org.w3c.css.properties.css.CssOverscrollBehavior {
+
+    CssOverscrollBehaviorX cssOverscrollBehaviorX;
+    CssOverscrollBehaviorY cssOverscrollBehaviorY;
+
+    public static final CssIdent[] allowed_values;
+
+    static {
+        String[] _allowed_values = {"contain", "none", "auto"};
+        int i = 0;
+        allowed_values = new CssIdent[_allowed_values.length];
+        for (String s : _allowed_values) {
+            allowed_values[i++] = CssIdent.getIdent(s);
+        }
+    }
+
+    public static final CssIdent getAllowedIdent(CssIdent ident) {
+        for (CssIdent id : allowed_values) {
+            if (id.equals(ident)) {
+                return id;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Create a new CssOverscrollBehavior
+     */
+    public CssOverscrollBehavior() {
+        value = initial;
+        cssOverscrollBehaviorX = new CssOverscrollBehaviorX();
+        cssOverscrollBehaviorY = new CssOverscrollBehaviorY();
+    }
+
+    /**
+     * Creates a new CssOverscrollBehavior
+     *
+     * @param expression The expression for this property
+     * @throws InvalidParamException Expressions are incorrect
+     */
+    public CssOverscrollBehavior(ApplContext ac, CssExpression expression, boolean check)
+            throws InvalidParamException {
+        if (check && expression.getCount() > 2) {
+            throw new InvalidParamException("unrecognize", ac);
+        }
+        setByUser();
+
+        cssOverscrollBehaviorX = new CssOverscrollBehaviorX();
+        cssOverscrollBehaviorY = new CssOverscrollBehaviorY();
+
+        switch (expression.getCount()) {
+            case 1:
+                value = checkOverscrollBehaviorAxis(ac, expression, check, this);
+                cssOverscrollBehaviorX.value = value;
+                cssOverscrollBehaviorY.value = value;
+                break;
+            case 2:
+                ArrayList v = new ArrayList();
+                CssValue val;
+                char op = expression.getOperator();
+                val = checkOverscrollBehaviorAxis(ac, expression, false, this);
+                if (val.getType() == CssTypes.CSS_IDENT && CssIdent.isCssWide(val.getIdent())) {
+                    throw new InvalidParamException("value", val,
+                            getPropertyName(), ac);
+                }
+                v.add(val);
+                cssOverscrollBehaviorX.value = val;
+                if (op != SPACE) {
+                    throw new InvalidParamException("operator",
+                            Character.toString(op), ac);
+                }
+                val = checkOverscrollBehaviorAxis(ac, expression, false, this);
+                if (val.getType() == CssTypes.CSS_IDENT && CssIdent.isCssWide(val.getIdent())) {
+                    throw new InvalidParamException("value", val,
+                            getPropertyName(), ac);
+                }
+                v.add(val);
+                cssOverscrollBehaviorY.value = val;
+                value = new CssValueList(v);
+                break;
+            default:
+                throw new InvalidParamException("unrecognize", ac);
+        }
+    }
+
+    public CssOverscrollBehavior(ApplContext ac, CssExpression expression)
+            throws InvalidParamException {
+        this(ac, expression, false);
+    }
+
+    /**
+     * Add this property to the CssStyle.
+     *
+     * @param style The CssStyle
+     */
+    public void addToStyle(ApplContext ac, CssStyle style) {
+        if (((Css3Style) style).cssOverscrollBehavior != null)
+            style.addRedefinitionWarning(ac, this);
+        ((Css3Style) style).cssOverscrollBehavior = this;
+        cssOverscrollBehaviorX.addToStyle(ac, style);
+        cssOverscrollBehaviorY.addToStyle(ac, style);
+    }
+
+    static CssValue checkOverscrollBehaviorAxis(ApplContext ac, CssExpression expression,
+                                                boolean check, CssProperty caller)
+            throws InvalidParamException {
+        CssValue value;
+
+        if (check && expression.getCount() > 1) {
+            throw new InvalidParamException("unrecognize", ac);
+        }
+
+        CssValue val;
+        char op;
+
+        val = expression.getValue();
+        op = expression.getOperator();
+
+        if (val.getType() != CssTypes.CSS_IDENT) {
+            throw new InvalidParamException("value", val,
+                    caller.getPropertyName(), ac);
+        }
+        CssIdent id = val.getIdent();
+        if (!CssIdent.isCssWide(id) && getAllowedIdent(id) == null) {
+            throw new InvalidParamException("value",
+                    val.toString(),
+                    caller.getPropertyName(), ac);
+        }
+        value = val;
+        expression.next();
+        return value;
+    }
+
+    /**
+     * Update the source file and the line.
+     * Overrides this method for a macro
+     *
+     * @param line   The line number where this property is defined
+     * @param source The source file where this property is defined
+     */
+    public void setInfo(int line, String source) {
+        super.setInfo(line, source);
+        cssOverscrollBehaviorX.setInfo(line, source);
+        cssOverscrollBehaviorY.setInfo(line, source);
+    }
+
+    /**
+     * Set this property to be important.
+     * Overrides this method for a macro
+     */
+    public void setImportant() {
+        super.setImportant();
+        cssOverscrollBehaviorX.setImportant();
+        cssOverscrollBehaviorY.setImportant();
+    }
+
+    /**
+     * Set the context.
+     * Overrides this method for a macro
+     *
+     * @see org.w3c.css.css.CssCascadingOrder#order
+     * @see org.w3c.css.css.StyleSheetParser#handleRule
+     */
+    public void setSelectors(CssSelectors selector) {
+        super.setSelectors(selector);
+        cssOverscrollBehaviorX.setSelectors(selector);
+        cssOverscrollBehaviorY.setSelectors(selector);
+    }
+}
+
diff --git a/org/w3c/css/properties/css3/CssOverscrollBehaviorBlock.java b/org/w3c/css/properties/css3/CssOverscrollBehaviorBlock.java
new file mode 100644
index 000000000..5acc17704
--- /dev/null
+++ b/org/w3c/css/properties/css3/CssOverscrollBehaviorBlock.java
@@ -0,0 +1,44 @@
+// $Id$
+// Author: Yves Lafon 
+//
+// (c) COPYRIGHT MIT, ERCIM and Keio University, 2012.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.properties.css3;
+
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+
+/**
+ * @spec https://www.w3.org/TR/2019/WD-css-overscroll-1-20190606/#propdef-overscroll-behavior-block
+ */
+public class CssOverscrollBehaviorBlock extends org.w3c.css.properties.css.CssOverscrollBehaviorBlock {
+
+    /**
+     * Create a new CssOverscrollBehaviorBlock
+     */
+    public CssOverscrollBehaviorBlock() {
+        value = initial;
+    }
+
+    /**
+     * Creates a new CssOverscrollBehaviorBlock
+     *
+     * @param expression The expression for this property
+     * @throws InvalidParamException
+     *          Expressions are incorrect
+     */
+    public CssOverscrollBehaviorBlock(ApplContext ac, CssExpression expression, boolean check)
+            throws InvalidParamException {
+        setByUser();
+        value = CssOverscrollBehavior.checkOverscrollBehaviorAxis(ac, expression, check, this);
+    }
+
+    public CssOverscrollBehaviorBlock(ApplContext ac, CssExpression expression)
+            throws InvalidParamException {
+        this(ac, expression, false);
+    }
+
+
+}
+
diff --git a/org/w3c/css/properties/css3/CssOverscrollBehaviorInline.java b/org/w3c/css/properties/css3/CssOverscrollBehaviorInline.java
new file mode 100644
index 000000000..23025780f
--- /dev/null
+++ b/org/w3c/css/properties/css3/CssOverscrollBehaviorInline.java
@@ -0,0 +1,44 @@
+// $Id$
+// Author: Yves Lafon 
+//
+// (c) COPYRIGHT MIT, ERCIM and Keio University, 2012.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.properties.css3;
+
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+
+/**
+ * @spec https://www.w3.org/TR/2019/WD-css-overscroll-1-20190606/#propdef-overscroll-behavior-inline
+ */
+public class CssOverscrollBehaviorInline extends org.w3c.css.properties.css.CssOverscrollBehaviorInline {
+
+    /**
+     * Create a new CssOverscrollBehaviorInline
+     */
+    public CssOverscrollBehaviorInline() {
+        value = initial;
+    }
+
+    /**
+     * Creates a new CssOverscrollBehaviorInline
+     *
+     * @param expression The expression for this property
+     * @throws InvalidParamException
+     *          Expressions are incorrect
+     */
+    public CssOverscrollBehaviorInline(ApplContext ac, CssExpression expression, boolean check)
+            throws InvalidParamException {
+        setByUser();
+        value = CssOverscrollBehavior.checkOverscrollBehaviorAxis(ac, expression, check, this);
+    }
+
+    public CssOverscrollBehaviorInline(ApplContext ac, CssExpression expression)
+            throws InvalidParamException {
+        this(ac, expression, false);
+    }
+
+
+}
+
diff --git a/org/w3c/css/properties/css3/CssOverscrollBehaviorX.java b/org/w3c/css/properties/css3/CssOverscrollBehaviorX.java
new file mode 100644
index 000000000..e093fddb4
--- /dev/null
+++ b/org/w3c/css/properties/css3/CssOverscrollBehaviorX.java
@@ -0,0 +1,44 @@
+// $Id$
+// Author: Yves Lafon 
+//
+// (c) COPYRIGHT MIT, ERCIM and Keio University, 2012.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.properties.css3;
+
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+
+/**
+ * @spec https://www.w3.org/TR/2019/WD-css-overscroll-1-20190606/#propdef-overscroll-behavior-x
+ */
+public class CssOverscrollBehaviorX extends org.w3c.css.properties.css.CssOverscrollBehaviorX {
+
+    /**
+     * Create a new CssOverscrollBehaviorX
+     */
+    public CssOverscrollBehaviorX() {
+        value = initial;
+    }
+
+    /**
+     * Creates a new CssOverscrollBehaviorX
+     *
+     * @param expression The expression for this property
+     * @throws InvalidParamException
+     *          Expressions are incorrect
+     */
+    public CssOverscrollBehaviorX(ApplContext ac, CssExpression expression, boolean check)
+            throws InvalidParamException {
+        setByUser();
+        value = CssOverscrollBehavior.checkOverscrollBehaviorAxis(ac, expression, check, this);
+    }
+
+    public CssOverscrollBehaviorX(ApplContext ac, CssExpression expression)
+            throws InvalidParamException {
+        this(ac, expression, false);
+    }
+
+
+}
+
diff --git a/org/w3c/css/properties/css3/CssOverscrollBehaviorY.java b/org/w3c/css/properties/css3/CssOverscrollBehaviorY.java
new file mode 100644
index 000000000..1c2dcbd74
--- /dev/null
+++ b/org/w3c/css/properties/css3/CssOverscrollBehaviorY.java
@@ -0,0 +1,44 @@
+// $Id$
+// Author: Yves Lafon 
+//
+// (c) COPYRIGHT MIT, ERCIM and Keio University, 2012.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.properties.css3;
+
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+
+/**
+ * @spec https://www.w3.org/TR/2019/WD-css-overscroll-1-20190606/#propdef-overscroll-behavior-y
+ */
+public class CssOverscrollBehaviorY extends org.w3c.css.properties.css.CssOverscrollBehaviorY {
+
+    /**
+     * Create a new CssOverscrollBehaviorY
+     */
+    public CssOverscrollBehaviorY() {
+        value = initial;
+    }
+
+    /**
+     * Creates a new CssOverscrollBehaviorY
+     *
+     * @param expression The expression for this property
+     * @throws InvalidParamException
+     *          Expressions are incorrect
+     */
+    public CssOverscrollBehaviorY(ApplContext ac, CssExpression expression, boolean check)
+            throws InvalidParamException {
+        setByUser();
+        value = CssOverscrollBehavior.checkOverscrollBehaviorAxis(ac, expression, check, this);
+    }
+
+    public CssOverscrollBehaviorY(ApplContext ac, CssExpression expression)
+            throws InvalidParamException {
+        this(ac, expression, false);
+    }
+
+
+}
+
diff --git a/org/w3c/css/properties/css3/CssPerspective.java b/org/w3c/css/properties/css3/CssPerspective.java
index 9f2fd8553..f05145d51 100644
--- a/org/w3c/css/properties/css3/CssPerspective.java
+++ b/org/w3c/css/properties/css3/CssPerspective.java
@@ -17,7 +17,7 @@
 import org.w3c.css.values.CssValue;
 
 /**
- * @spec https://www.w3.org/TR/2020/WD-css-transforms-2-20200303/#propdef-perspective
+ * @spec https://www.w3.org/TR/2021/WD-css-transforms-2-20211109/#propdef-perspective
  */
 
 public class CssPerspective extends org.w3c.css.properties.css.CssPerspective {
diff --git a/org/w3c/css/properties/css3/CssPerspectiveOrigin.java b/org/w3c/css/properties/css3/CssPerspectiveOrigin.java
index 7df57db33..d45bd2eb3 100644
--- a/org/w3c/css/properties/css3/CssPerspectiveOrigin.java
+++ b/org/w3c/css/properties/css3/CssPerspectiveOrigin.java
@@ -18,13 +18,15 @@
 import static org.w3c.css.values.CssOperator.SPACE;
 
 /**
- * @spec http://www.w3.org/TR/2012/WD-css3-transforms-20120911/#perspective-origin
+ * @spec https://www.w3.org/TR/2021/WD-css-transforms-2-20211109/#propdef-perspective-origin
  */
 public class CssPerspectiveOrigin extends org.w3c.css.properties.css.CssPerspectiveOrigin {
 
     public static CssIdent[] allowed_values;
     public static CssIdent center, top, bottom, left, right;
 
+    // FIXME this should be a generic 'position' parsing
+    
     static {
         top = CssIdent.getIdent("top");
         bottom = CssIdent.getIdent("bottom");
diff --git a/org/w3c/css/properties/css3/CssRotate.java b/org/w3c/css/properties/css3/CssRotate.java
new file mode 100644
index 000000000..a8e96da0b
--- /dev/null
+++ b/org/w3c/css/properties/css3/CssRotate.java
@@ -0,0 +1,136 @@
+//
+// Author: Yves Lafon 
+//
+// (c) COPYRIGHT World Wide Web Consortium, 2025.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.properties.css3;
+
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
+import org.w3c.css.values.CssTypes;
+import org.w3c.css.values.CssValue;
+import org.w3c.css.values.CssValueList;
+
+import java.util.ArrayList;
+
+import static org.w3c.css.values.CssOperator.SPACE;
+
+/**
+ * @spec https://www.w3.org/TR/2021/WD-css-transforms-2-20211109/#propdef-rotate
+ */
+public class CssRotate extends org.w3c.css.properties.css.CssRotate {
+
+    public static final CssIdent[] allowedValues;
+
+    static {
+        String[] _allowedValues = {"x", "y", "z"};
+        allowedValues = new CssIdent[_allowedValues.length];
+        for (int i = 0; i < allowedValues.length; i++) {
+            allowedValues[i] = CssIdent.getIdent(_allowedValues[i]);
+        }
+    }
+
+    public static final CssIdent getAllowedValue(CssIdent ident) {
+        for (CssIdent id : allowedValues) {
+            if (id.equals(ident)) {
+                return id;
+            }
+        }
+        return null;
+    }
+    /**
+     * Create a new CssRotate
+     */
+    public CssRotate() {
+        value = initial;
+    }
+
+    /**
+     * Creates a new CssRotate
+     *
+     * @param expression The expression for this property
+     * @throws InvalidParamException Expressions are incorrect
+     */
+    public CssRotate(ApplContext ac, CssExpression expression, boolean check)
+            throws InvalidParamException {
+        if (check && expression.getCount() > 4) {
+            throw new InvalidParamException("unrecognize", ac);
+        }
+        CssValue val;
+        ArrayList v = new ArrayList<>();
+        char op;
+        int nbNumber = 0;
+        boolean gotIdent = false;
+        boolean gotAngle = false;
+        setByUser();
+
+
+        while (!expression.end()) {
+            val = expression.getValue();
+            op = expression.getOperator();
+
+            switch (val.getType()) {
+                case CssTypes.CSS_NUMBER:
+                    // if we got an axis or more than 3 values, report error
+                    if (gotIdent || (nbNumber == 3)) {
+                        throw new InvalidParamException("value", val.toString(),
+                                getPropertyName(), ac);
+                    }
+                    nbNumber++;
+                    v.add(val);
+                    break;
+                case CssTypes.CSS_ANGLE:
+                    // if we got numbers, we must get them all before the angle value
+                    if (gotAngle || nbNumber == 1 || nbNumber == 2) {
+                        throw new InvalidParamException("value", val.toString(),
+                                getPropertyName(), ac);
+                    }
+                    gotAngle = true;
+                    v.add(val);
+                    break;
+                case CssTypes.CSS_IDENT:
+                    CssIdent id = val.getIdent();
+                    if (none.equals(id) || CssIdent.isCssWide(id)) {
+                        if (expression.getCount() > 1) {
+                            throw new InvalidParamException("value", val.toString(),
+                                    getPropertyName(), ac);
+                        }
+                        v.add(val);
+                        break;
+                    }
+                    // if wa got a number (ie: defining axis) or another ident axis, report error
+                    if (!gotIdent && (nbNumber == 0) && getAllowedValue(id) != null) {
+                        v.add(val);
+                        gotIdent = true;
+                        break;
+                    }
+                    // unrecognize ident, or unwanted one, let it fail
+                default:
+                    throw new InvalidParamException("value",
+                            val.toString(),
+                            getPropertyName(), ac);
+            }
+            if (op != SPACE) {
+                throw new InvalidParamException("operator",
+                        Character.toString(op), ac);
+            }
+            expression.next();
+        }
+        // sanity check, if we got an axis, we should get an angle, if we got number we should get 3 of them
+        if ((nbNumber > 0 && nbNumber != 3) || ((gotIdent || (nbNumber != 0)) && !gotAngle)) {
+            throw new InvalidParamException("value",
+                    v.toString(),
+                    getPropertyName(), ac);
+        }
+        value = (v.size() == 1) ? v.get(0) : new CssValueList(v);
+    }
+
+
+    public CssRotate(ApplContext ac, CssExpression expression)
+            throws InvalidParamException {
+        this(ac, expression, false);
+    }
+}
+
diff --git a/org/w3c/css/properties/css3/CssScale.java b/org/w3c/css/properties/css3/CssScale.java
new file mode 100644
index 000000000..f77be61e4
--- /dev/null
+++ b/org/w3c/css/properties/css3/CssScale.java
@@ -0,0 +1,90 @@
+//
+// Author: Yves Lafon 
+//
+// (c) COPYRIGHT World Wide Web Consortium, 2025.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.properties.css3;
+
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
+import org.w3c.css.values.CssTypes;
+import org.w3c.css.values.CssValue;
+import org.w3c.css.values.CssValueList;
+
+import java.util.ArrayList;
+
+import static org.w3c.css.values.CssOperator.SPACE;
+
+/**
+ * @spec https://www.w3.org/TR/2021/WD-css-transforms-2-20211109/#propdef-scale
+ */
+public class CssScale extends org.w3c.css.properties.css.CssScale {
+
+    /**
+     * Create a new CssScale
+     */
+    public CssScale() {
+        value = initial;
+    }
+
+    /**
+     * Creates a new CssScale
+     *
+     * @param expression The expression for this property
+     * @throws InvalidParamException Expressions are incorrect
+     */
+    public CssScale(ApplContext ac, CssExpression expression, boolean check)
+            throws InvalidParamException {
+        if (check && expression.getCount() > 3) {
+            throw new InvalidParamException("unrecognize", ac);
+        }
+        CssValue val;
+        ArrayList v = new ArrayList<>();
+        char op;
+        setByUser();
+
+
+        while (!expression.end()) {
+            val = expression.getValue();
+            op = expression.getOperator();
+
+            switch (val.getType()) {
+                case CssTypes.CSS_NUMBER:
+                case CssTypes.CSS_PERCENTAGE:
+                    // spec is silent on negative values
+                    v.add(val);
+                    break;
+                case CssTypes.CSS_IDENT:
+                    CssIdent id = val.getIdent();
+                    if (none.equals(id) || CssIdent.isCssWide(id)) {
+                        if (expression.getCount() > 1) {
+                            throw new InvalidParamException("value", val.toString(),
+                                    getPropertyName(), ac);
+                        }
+                        v.add(val);
+                        break;
+                    }
+                    // unrecognize ident, let it fail
+                default:
+                    throw new InvalidParamException("value",
+                            val.toString(),
+                            getPropertyName(), ac);
+            }
+            if (op != SPACE) {
+                throw new InvalidParamException("operator",
+                        Character.toString(op), ac);
+            }
+            expression.next();
+        }
+        value = (v.size() == 1) ? v.get(0) : new CssValueList(v);
+    }
+
+
+    public CssScale(ApplContext ac, CssExpression expression)
+            throws InvalidParamException {
+        this(ac, expression, false);
+    }
+}
+
diff --git a/org/w3c/css/properties/css3/CssScrollbarColor.java b/org/w3c/css/properties/css3/CssScrollbarColor.java
index 8f7f645c3..199545e5c 100644
--- a/org/w3c/css/properties/css3/CssScrollbarColor.java
+++ b/org/w3c/css/properties/css3/CssScrollbarColor.java
@@ -18,7 +18,7 @@
 import static org.w3c.css.values.CssOperator.SPACE;
 
 /**
- * @spec https://www.w3.org/TR/2021/WD-css-scrollbars-1-20210829/#propdef-scrollbar-color
+ * @spec https://www.w3.org/TR/2021/CR-css-scrollbars-1-20211209/#propdef-scrollbar-color
  */
 public class CssScrollbarColor extends org.w3c.css.properties.css.CssScrollbarColor {
 
@@ -74,7 +74,7 @@ public CssScrollbarColor(ApplContext ac, CssExpression expression, boolean check
 
         switch (val.getType()) {
             case CssTypes.CSS_IDENT:
-                if (inherit.equals(val)) {
+                if (CssIdent.isCssWide(val.getIdent())) {
                     if (expression.getCount() != 1) {
                         throw new InvalidParamException("value",
                                 val.toString(),
@@ -143,7 +143,7 @@ public CssScrollbarColor(ApplContext ac, CssExpression expression, boolean check
             val = expression.getValue();
             switch (val.getType()) {
                 case CssTypes.CSS_IDENT:
-                    if (inherit.equals(val)) {
+                    if (CssIdent.isCssWide(val.getIdent())) {
                         throw new InvalidParamException("value",
                                 val.toString(),
                                 getPropertyName(), ac);
diff --git a/org/w3c/css/properties/css3/CssScrollbarWidth.java b/org/w3c/css/properties/css3/CssScrollbarWidth.java
index d4d0e9384..9f07ae220 100644
--- a/org/w3c/css/properties/css3/CssScrollbarWidth.java
+++ b/org/w3c/css/properties/css3/CssScrollbarWidth.java
@@ -13,7 +13,7 @@
 import org.w3c.css.values.CssValue;
 
 /**
- * @spec https://www.w3.org/TR/2021/WD-css-scrollbars-1-20210829/#propdef-scrollbar-width
+ * @spec https://www.w3.org/TR/2021/CR-css-scrollbars-1-20211209/#propdef-scrollbar-width
  */
 public class CssScrollbarWidth extends org.w3c.css.properties.css.CssScrollbarWidth {
 
@@ -66,7 +66,7 @@ public CssScrollbarWidth(ApplContext ac, CssExpression expression, boolean check
 
         switch (val.getType()) {
             case CssTypes.CSS_IDENT:
-                if (inherit.equals(val)) {
+                if (CssIdent.isCssWide(val.getIdent())) {
                     value = val;
                     break;
                 } else {
diff --git a/org/w3c/css/properties/css3/CssTabSize.java b/org/w3c/css/properties/css3/CssTabSize.java
index c6becc24b..133d57676 100644
--- a/org/w3c/css/properties/css3/CssTabSize.java
+++ b/org/w3c/css/properties/css3/CssTabSize.java
@@ -1,7 +1,7 @@
-// $Id$
+// 
 // Author: Yves Lafon 
 //
-// (c) COPYRIGHT MIT, ERCIM and Keio University, 2012.
+// (c) COPYRIGHT World Wide Web Consortium, 2024.
 // Please first read the full copyright statement in file COPYRIGHT.html
 package org.w3c.css.properties.css3;
 
@@ -14,7 +14,7 @@
 import org.w3c.css.values.CssValue;
 
 /**
- * @spec https://www.w3.org/TR/2017/WD-css-text-3-20170822/#tab-size-property
+ * @spec https://www.w3.org/TR/2024/WD-css-text-4-20240219/#propdef-tab-size
  */
 public class CssTabSize extends org.w3c.css.properties.css.CssTabSize {
 
diff --git a/org/w3c/css/properties/css3/CssTextAlign.java b/org/w3c/css/properties/css3/CssTextAlign.java
index cad80818b..7934e051f 100644
--- a/org/w3c/css/properties/css3/CssTextAlign.java
+++ b/org/w3c/css/properties/css3/CssTextAlign.java
@@ -13,7 +13,7 @@
 import org.w3c.css.values.CssValue;
 
 /**
- * @spec https://www.w3.org/TR/2021/CRD-css-text-3-20210422/#propdef-text-align
+ * @spec https://www.w3.org/TR/2024/WD-css-text-4-20240219/#propdef-text-align
  */
 public class CssTextAlign extends org.w3c.css.properties.css.CssTextAlign {
 
@@ -60,19 +60,33 @@ public CssTextAlign(ApplContext ac, CssExpression expression, boolean check)
             throw new InvalidParamException("unrecognize", ac);
         }
 
-        if (val.getType() != CssTypes.CSS_IDENT) {
-            throw new InvalidParamException("value",
-                    expression.getValue(),
-                    getPropertyName(), ac);
-        }
-        CssIdent id = val.getIdent();
-        if (!CssIdent.isCssWide(id) && getAllowedIdent(id) == null) {
-            throw new InvalidParamException("value",
-                    expression.getValue(),
-                    getPropertyName(), ac);
+        switch (val.getType()) {
+            case CssTypes.CSS_IDENT:
+                CssIdent id = val.getIdent();
+                if (!CssIdent.isCssWide(id) && getAllowedIdent(id) == null) {
+                    throw new InvalidParamException("value",
+                            expression.getValue(),
+                            getPropertyName(), ac);
 
+                }
+                value = val;
+                break;
+            case CssTypes.CSS_STRING:
+                if (val.getRawType() == CssTypes.CSS_STRING) {
+                    // string length must be 1, so 3 including delimiters
+                    if (val.toString().length() > 3) {
+                        throw new InvalidParamException("value",
+                                expression.getValue(),
+                                getPropertyName(), ac);
+                    }
+                }
+                value = val;
+                break;
+            default:
+                throw new InvalidParamException("value",
+                        expression.getValue(),
+                        getPropertyName(), ac);
         }
-        value = val;
         expression.next();
     }
 
diff --git a/org/w3c/css/properties/css3/CssTextAlignAll.java b/org/w3c/css/properties/css3/CssTextAlignAll.java
index 1661d5135..fad0f1341 100644
--- a/org/w3c/css/properties/css3/CssTextAlignAll.java
+++ b/org/w3c/css/properties/css3/CssTextAlignAll.java
@@ -13,7 +13,7 @@
 import org.w3c.css.values.CssValue;
 
 /**
- * @spec https://www.w3.org/TR/2021/CRD-css-text-3-20210422/#propdef-text-align-all
+ * @spec https://www.w3.org/TR/2024/WD-css-text-4-20240219/#propdef-text-align-all
  */
 public class CssTextAlignAll extends org.w3c.css.properties.css.CssTextAlignAll {
 
@@ -59,19 +59,33 @@ public CssTextAlignAll(ApplContext ac, CssExpression expression, boolean check)
             throw new InvalidParamException("unrecognize", ac);
         }
 
-        if (val.getType() != CssTypes.CSS_IDENT) {
-            throw new InvalidParamException("value",
-                    expression.getValue(),
-                    getPropertyName(), ac);
-        }
-        CssIdent id = val.getIdent();
-        if (!CssIdent.isCssWide(id) && getAllowedIdent(id) == null) {
-            throw new InvalidParamException("value",
-                    expression.getValue(),
-                    getPropertyName(), ac);
+        switch (val.getType()) {
+            case CssTypes.CSS_IDENT:
+                CssIdent id = val.getIdent();
+                if (!CssIdent.isCssWide(id) && getAllowedIdent(id) == null) {
+                    throw new InvalidParamException("value",
+                            expression.getValue(),
+                            getPropertyName(), ac);
 
+                }
+                value = val;
+                break;
+            case CssTypes.CSS_STRING:
+                if (val.getRawType() == CssTypes.CSS_STRING) {
+                    // string length must be 1, so 3 including delimiters
+                    if (val.toString().length() > 3) {
+                        throw new InvalidParamException("value",
+                                expression.getValue(),
+                                getPropertyName(), ac);
+                    }
+                }
+                value = val;
+                break;
+            default:
+                throw new InvalidParamException("value",
+                        expression.getValue(),
+                        getPropertyName(), ac);
         }
-        value = val;
         expression.next();
     }
 
diff --git a/org/w3c/css/properties/css3/CssTextAlignLast.java b/org/w3c/css/properties/css3/CssTextAlignLast.java
index f5b6b4a5f..c37e9ccd6 100644
--- a/org/w3c/css/properties/css3/CssTextAlignLast.java
+++ b/org/w3c/css/properties/css3/CssTextAlignLast.java
@@ -13,7 +13,7 @@
 import org.w3c.css.values.CssValue;
 
 /**
- * @spec https://www.w3.org/TR/2021/CRD-css-text-3-20210422/#text-align-last-property
+ * @spec https://www.w3.org/TR/2024/WD-css-text-4-20240219/#propdef-text-align-last
  */
 public class CssTextAlignLast extends org.w3c.css.properties.css.CssTextAlignLast {
 
diff --git a/org/w3c/css/properties/css3/CssTextAutospace.java b/org/w3c/css/properties/css3/CssTextAutospace.java
new file mode 100644
index 000000000..ec0a4e28a
--- /dev/null
+++ b/org/w3c/css/properties/css3/CssTextAutospace.java
@@ -0,0 +1,229 @@
+//
+// Author: Yves Lafon 
+//
+// (c) COPYRIGHT MIT, ERCIM, Keio University, Beihang, 2012.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.properties.css3;
+
+import org.w3c.css.properties.css.CssProperty;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
+import org.w3c.css.values.CssTypes;
+import org.w3c.css.values.CssValue;
+import org.w3c.css.values.CssValueList;
+
+import java.util.ArrayList;
+
+import static org.w3c.css.values.CssOperator.SPACE;
+
+/**
+ * @spec https://www.w3.org/TR/2024/WD-css-text-4-20240219/#text-autospace-property
+ */
+public class CssTextAutospace extends org.w3c.css.properties.css.CssTextAutospace {
+
+    private static CssIdent[] allowed_values;
+    private static CssIdent[] ideograph_axis, behaviour_axis;
+    private static CssIdent single_val;
+
+    static {
+        String[] id_values = {"normal", "auto", "no-autospace", "ideograph-alpha", "ideograph-numeric", "punctuation",
+                "insert", "replace"};
+        String[] id_axis = {"ideograph-alpha", "ideograph-numeric", "punctuation"};
+        String[] be_axis = {"insert", "replace"};
+        single_val = CssIdent.getIdent("no-autospace");
+        allowed_values = new CssIdent[id_values.length];
+        int i = 0;
+        for (String s : id_values) {
+            allowed_values[i++] = CssIdent.getIdent(s);
+        }
+        ideograph_axis = new CssIdent[id_axis.length];
+        i = 0;
+        for (String s : id_axis) {
+            ideograph_axis[i++] = CssIdent.getIdent(s);
+        }
+        behaviour_axis = new CssIdent[be_axis.length];
+        i = 0;
+        for (String s : be_axis) {
+            behaviour_axis[i++] = CssIdent.getIdent(s);
+        }
+    }
+
+    public static CssIdent getAllowedIdent(CssIdent ident) {
+        for (CssIdent id : allowed_values) {
+            if (id.equals(ident)) {
+                return id;
+            }
+        }
+        return null;
+    }
+
+    public static CssIdent getAutospaceIdent(CssIdent ident) {
+        if (single_val.equals(ident)) {
+            return single_val;
+        }
+        for (CssIdent id : ideograph_axis) {
+            if (id.equals(ident)) {
+                return id;
+            }
+        }
+        for (CssIdent id : behaviour_axis) {
+            if (id.equals(ident)) {
+                return id;
+            }
+        }
+        return null;
+    }
+
+    public static boolean isIdeographAxis(CssIdent ident) {
+        for (CssIdent id : ideograph_axis) {
+            if (id.equals(ident)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static boolean isBehaviourAxis(CssIdent ident) {
+        for (CssIdent id : behaviour_axis) {
+            if (id.equals(ident)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Create a new CssTextAutospace
+     */
+    public CssTextAutospace() {
+        value = initial;
+    }
+
+    /**
+     * Creates a new CssTextAutospace
+     *
+     * @param expression The expression for this property
+     * @throws InvalidParamException Expressions are incorrect
+     */
+    public CssTextAutospace(ApplContext ac, CssExpression expression, boolean check)
+            throws InvalidParamException {
+        CssIdent id;
+
+        setByUser();
+        CssValue val = expression.getValue();
+
+        if (check && expression.getCount() > 4) {
+            throw new InvalidParamException("unrecognize", ac);
+        }
+
+        if (val.getType() != CssTypes.CSS_IDENT) {
+            throw new InvalidParamException("value",
+                    expression.getValue(),
+                    getPropertyName(), ac);
+        }
+        id = val.getIdent();
+        if (CssIdent.isCssWide(id)) {
+            if (expression.getCount() > 1) {
+                throw new InvalidParamException("value",
+                        expression.getValue(),
+                        getPropertyName(), ac);
+            }
+            value = val;
+            expression.next();
+        } else if (getAllowedIdent(id) != null) {
+            // ident or 
+            if (getAutospaceIdent(id) != null) {
+                // 
+                value = checkAutoSpace(ac, expression, this);
+            } else {
+                if (expression.getCount() > 1) {
+                    throw new InvalidParamException("value",
+                            expression.getValue(),
+                            getPropertyName(), ac);
+                }
+                value = val;
+                expression.next();
+            }
+        } else {
+            throw new InvalidParamException("value",
+                    expression.getValue(),
+                    getPropertyName(), ac);
+        }
+
+    }
+
+
+    public CssTextAutospace(ApplContext ac, CssExpression expression)
+            throws InvalidParamException {
+        this(ac, expression, false);
+    }
+
+    // this function only check if the expression is an 
+    public static CssValue checkAutoSpace(ApplContext ac, CssExpression expression, CssProperty caller)
+            throws InvalidParamException {
+        ArrayList values = new ArrayList();
+        CssValue val;
+        CssIdent id;
+        char op;
+        boolean got_behaviour = false;
+
+        if (expression.getCount() > 4) {
+            throw new InvalidParamException("unrecognize", ac);
+        }
+
+        while (!expression.end()) {
+            val = expression.getValue();
+            op = expression.getOperator();
+
+            if (val.getType() != CssTypes.CSS_IDENT) {
+                throw new InvalidParamException("value",
+                        expression.getValue(),
+                        caller.getPropertyName(), ac);
+            }
+            id = val.getIdent();
+            if (getAutospaceIdent(id) != null) {
+                if (!isIdeographAxis(id) && !isBehaviourAxis(id)) {
+                    if (expression.getCount() > 1) {
+                        throw new InvalidParamException("value",
+                                expression.getValue(),
+                                caller.getPropertyName(), ac);
+                    }
+                    values.add(val);
+                } else {
+                    // check we don't have two of those
+                    if (isBehaviourAxis(id)) {
+                        if (got_behaviour) {
+                            throw new InvalidParamException("value",
+                                    expression.getValue(),
+                                    caller.getPropertyName(), ac);
+                        } else {
+                            got_behaviour = true;
+                        }
+                    }
+                    // avoid duplicates. TODO is that a good enough check? See attr/var
+                    if (values.contains(id)) {
+                        throw new InvalidParamException("value",
+                                expression.getValue(),
+                                caller.getPropertyName(), ac);
+                    }
+                    values.add(val);
+                }
+            } else {
+                throw new InvalidParamException("value",
+                        expression.getValue(),
+                        caller.getPropertyName(), ac);
+            }
+            if (op != SPACE) {
+                throw new InvalidParamException("operator", op,
+                        caller.getPropertyName(), ac);
+            }
+            expression.next();
+        }
+        return (values.size() == 1) ? values.get(0) : new CssValueList(values);
+
+    }
+
+}
+
diff --git a/org/w3c/css/properties/css3/CssTextGroupAlign.java b/org/w3c/css/properties/css3/CssTextGroupAlign.java
new file mode 100644
index 000000000..104c3bd1a
--- /dev/null
+++ b/org/w3c/css/properties/css3/CssTextGroupAlign.java
@@ -0,0 +1,84 @@
+//
+// Author: Yves Lafon 
+//
+// (c) COPYRIGHT MIT, ERCIM and Keio University, Beihang, 2012.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.properties.css3;
+
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
+import org.w3c.css.values.CssTypes;
+import org.w3c.css.values.CssValue;
+
+/**
+ * @spec https://www.w3.org/TR/2024/WD-css-text-4-20240219/#propdef-text-group-align
+ */
+public class CssTextGroupAlign extends org.w3c.css.properties.css.CssTextGroupAlign {
+
+    private static CssIdent[] allowed_values;
+
+    //
+    static {
+        String id_values[] = {"none", "start", "end", "left", "right", "center"};
+        allowed_values = new CssIdent[id_values.length];
+        int i = 0;
+        for (String s : id_values) {
+            allowed_values[i++] = CssIdent.getIdent(s);
+        }
+    }
+
+    public static CssIdent getMatchingIdent(CssIdent ident) {
+        for (CssIdent id : allowed_values) {
+            if (id.equals(ident)) {
+                return id;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Create a new CssTextGroupAlign
+     */
+    public CssTextGroupAlign() {
+        value = initial;
+    }
+
+    /**
+     * Creates a new CssTextGroupAlign
+     *
+     * @param expression The expression for this property
+     * @throws InvalidParamException Expressions are incorrect
+     */
+    public CssTextGroupAlign(ApplContext ac, CssExpression expression, boolean check)
+            throws InvalidParamException {
+        setByUser();
+        CssValue val = expression.getValue();
+
+        if (check && expression.getCount() > 1) {
+            throw new InvalidParamException("unrecognize", ac);
+        }
+
+        if (val.getType() != CssTypes.CSS_IDENT) {
+            throw new InvalidParamException("value",
+                    expression.getValue(),
+                    getPropertyName(), ac);
+        }
+        // ident, so inherit, or allowed value
+        if (!CssIdent.isCssWide(val.getIdent()) && getMatchingIdent(val.getIdent()) == null) {
+            throw new InvalidParamException("value",
+                    expression.getValue(),
+                    getPropertyName(), ac);
+        }
+        value = val;
+        expression.next();
+    }
+
+    public CssTextGroupAlign(ApplContext ac, CssExpression expression)
+            throws InvalidParamException {
+        this(ac, expression, false);
+    }
+
+}
+
diff --git a/org/w3c/css/properties/css3/CssTextIndent.java b/org/w3c/css/properties/css3/CssTextIndent.java
index 792cc90a5..81ac40870 100644
--- a/org/w3c/css/properties/css3/CssTextIndent.java
+++ b/org/w3c/css/properties/css3/CssTextIndent.java
@@ -16,7 +16,7 @@
 import java.util.ArrayList;
 
 /**
- * @spec https://www.w3.org/TR/2021/CRD-css-text-3-20210422/#propdef-text-indent
+ * @spec https://www.w3.org/TR/2024/WD-css-text-4-20240219/#propdef-text-indent
  */
 public class CssTextIndent extends org.w3c.css.properties.css.CssTextIndent {
 
diff --git a/org/w3c/css/properties/css3/CssTextJustify.java b/org/w3c/css/properties/css3/CssTextJustify.java
index 21f39627d..6f00223fa 100644
--- a/org/w3c/css/properties/css3/CssTextJustify.java
+++ b/org/w3c/css/properties/css3/CssTextJustify.java
@@ -11,16 +11,24 @@
 import org.w3c.css.values.CssIdent;
 import org.w3c.css.values.CssTypes;
 import org.w3c.css.values.CssValue;
+import org.w3c.css.values.CssValueList;
+
+import java.util.ArrayList;
+
+import static org.w3c.css.values.CssOperator.SPACE;
 
 /**
- * @spec https://www.w3.org/TR/2021/CRD-css-text-3-20210422/#propdef-text-justify
+ * @spec https://www.w3.org/TR/2024/WD-css-text-4-20240219/#text-justify-property
  */
 public class CssTextJustify extends org.w3c.css.properties.css.CssTextJustify {
 
     private static CssIdent[] allowed_values;
+    private static CssIdent no_compress, distribute;
 
     static {
-        String id_values[] = {"auto", "none", "inter-word", "inter-character"};
+        no_compress = CssIdent.getIdent("no-compress");
+        distribute = CssIdent.getIdent("distribute");
+        String id_values[] = {"auto", "none", "inter-word", "inter-character", "ruby", "distribute"};
         allowed_values = new CssIdent[id_values.length];
         int i = 0;
         for (String s : id_values) {
@@ -52,28 +60,66 @@ public CssTextJustify() {
      */
     public CssTextJustify(ApplContext ac, CssExpression expression, boolean check)
             throws InvalidParamException {
+        ArrayList values = new ArrayList();
+        CssValue val;
+        CssExpression trimexp = null;
+        CssIdent id;
+        boolean got_no_compress = false;
+        char op;
+
         setByUser();
-        CssValue val = expression.getValue();
 
-        if (check && expression.getCount() > 1) {
+        if (check && expression.getCount() > 2) {
             throw new InvalidParamException("unrecognize", ac);
         }
 
-        if (val.getType() != CssTypes.CSS_IDENT) {
-            throw new InvalidParamException("value",
-                    expression.getValue(),
-                    getPropertyName(), ac);
-        }
-        // ident, so inherit, or allowed value
-        CssIdent id = val.getIdent();
+        while (!expression.end()) {
+            val = expression.getValue();
+            op = expression.getOperator();
 
-        if (!CssIdent.isCssWide(id) && (getMatchingIdent(id) == null)) {
-            throw new InvalidParamException("value",
-                    expression.getValue(),
-                    getPropertyName(), ac);
+            if (val.getType() != CssTypes.CSS_IDENT) {
+                throw new InvalidParamException("value",
+                        expression.getValue(),
+                        getPropertyName(), ac);
+            }
+            id = val.getIdent();
+            if (CssIdent.isCssWide(id)) {
+                if (expression.getCount() > 1) {
+                    throw new InvalidParamException("value",
+                            expression.getValue(),
+                            getPropertyName(), ac);
+                }
+                values.add(val);
+            } else if (id.equals(no_compress)) {
+                if (got_no_compress) {
+                    throw new InvalidParamException("value",
+                            expression.getValue(),
+                            getPropertyName(), ac);
+                }
+                got_no_compress = true;
+                values.add(val);
+            } else if (getMatchingIdent(id) != null) {
+                if (!got_no_compress && !values.isEmpty()) {
+                    throw new InvalidParamException("value",
+                            expression.getValue(),
+                            getPropertyName(), ac);
+                }
+                values.add(val);
+                if (distribute.equals(id)) {
+                    ac.getFrame().addWarning("deprecated", distribute.toString());
+                }
+            } else {
+                throw new InvalidParamException("value",
+                        expression.getValue(),
+                        getPropertyName(), ac);
+            }
+            if (op != SPACE) {
+                throw new InvalidParamException("operator", op,
+                        getPropertyName(), ac);
+            }
+            expression.next();
         }
-        value = val;
-        expression.next();
+        value = (values.size() == 1) ? values.get(0) : new CssValueList(values);
     }
 
     public CssTextJustify(ApplContext ac, CssExpression expression)
diff --git a/org/w3c/css/properties/css3/CssTextSpacing.java b/org/w3c/css/properties/css3/CssTextSpacing.java
new file mode 100644
index 000000000..ad8049f97
--- /dev/null
+++ b/org/w3c/css/properties/css3/CssTextSpacing.java
@@ -0,0 +1,137 @@
+//
+// Author: Yves Lafon 
+//
+// (c) COPYRIGHT MIT, ERCIM, Keio University, Beihang, 2012.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.properties.css3;
+
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
+import org.w3c.css.values.CssTypes;
+import org.w3c.css.values.CssValue;
+import org.w3c.css.values.CssValueList;
+
+import java.util.ArrayList;
+
+import static org.w3c.css.values.CssOperator.SPACE;
+
+/**
+ * @spec https://www.w3.org/TR/2024/WD-css-text-4-20240219/#propdef-text-spacing
+ * @see CssTextAutospace
+ * @see CssTextSpacingTrim
+ */
+public class CssTextSpacing extends org.w3c.css.properties.css.CssTextSpacing {
+
+    private static CssIdent[] allowed_values;
+
+    static {
+        String[] id_values = {"none", "auto"};
+        allowed_values = new CssIdent[id_values.length];
+        int i = 0;
+        for (String s : id_values) {
+            allowed_values[i++] = CssIdent.getIdent(s);
+        }
+    }
+
+    public static CssIdent getAllowedIdent(CssIdent ident) {
+        for (CssIdent id : allowed_values) {
+            if (id.equals(ident)) {
+                return id;
+            }
+        }
+        return null;
+    }
+
+
+    /**
+     * Create a new CssTextSpacing
+     */
+    public CssTextSpacing() {
+        value = initial;
+    }
+
+    /**
+     * Creates a new CssTextSpacing
+     *
+     * @param expression The expression for this property
+     * @throws InvalidParamException Expressions are incorrect
+     */
+    public CssTextSpacing(ApplContext ac, CssExpression expression, boolean check)
+            throws InvalidParamException {
+        ArrayList values = new ArrayList();
+        CssValue val;
+        CssExpression spacexp = null;
+        boolean has_trim = false;
+        CssIdent id;
+        char op;
+
+        setByUser();
+
+        while (!expression.end()) {
+            val = expression.getValue();
+            op = expression.getOperator();
+
+            if (val.getType() != CssTypes.CSS_IDENT) {
+                throw new InvalidParamException("value",
+                        expression.getValue(),
+                        getPropertyName(), ac);
+            }
+            id = val.getIdent();
+            if (CssIdent.isCssWide(id)) {
+                if (expression.getCount() > 1) {
+                    throw new InvalidParamException("value",
+                            expression.getValue(),
+                            getPropertyName(), ac);
+                }
+                values.add(val);
+            } else if (getAllowedIdent(id) != null) {
+                // the single values
+                if (expression.getCount() > 1) {
+                    throw new InvalidParamException("value",
+                            expression.getValue(),
+                            getPropertyName(), ac);
+                }
+                values.add(val);
+            } else if (CssTextSpacingTrim.getSpacingTrimIdent(id) != null) {
+                if (has_trim) {
+                    throw new InvalidParamException("value",
+                            expression.getValue(),
+                            getPropertyName(), ac);
+                }
+                has_trim = true;
+                values.add(val);
+            } else if (CssTextAutospace.getAutospaceIdent(id) != null) {
+                if (spacexp == null) {
+                    spacexp = new CssExpression();
+                }
+                // FIXME one way would be to add _all_ the matching idents
+                // FIXME then refuse new ones (as avoid values being mixed between
+                // FIXME autospace and spacing-trim)
+                spacexp.addValue(val);
+                spacexp.setOperator(op);
+            } else {
+                throw new InvalidParamException("value",
+                        expression.getValue(),
+                        getPropertyName(), ac);
+            }
+            if (op != SPACE) {
+                throw new InvalidParamException("operator", op,
+                        getPropertyName(), ac);
+            }
+            expression.next();
+        }
+        if (spacexp != null) {
+            values.add(CssTextAutospace.checkAutoSpace(ac, spacexp, this));
+        }
+        value = (values.size() == 1) ? values.get(0) : new CssValueList(values);
+    }
+
+    public CssTextSpacing(ApplContext ac, CssExpression expression)
+            throws InvalidParamException {
+        this(ac, expression, false);
+    }
+
+}
+
diff --git a/org/w3c/css/properties/css3/CssTextSpacingTrim.java b/org/w3c/css/properties/css3/CssTextSpacingTrim.java
new file mode 100644
index 000000000..27ff01cfc
--- /dev/null
+++ b/org/w3c/css/properties/css3/CssTextSpacingTrim.java
@@ -0,0 +1,99 @@
+//
+// Author: Yves Lafon 
+//
+// (c) COPYRIGHT MIT, ERCIM, Keio University, Beihang, 2012.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.properties.css3;
+
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
+import org.w3c.css.values.CssTypes;
+import org.w3c.css.values.CssValue;
+
+/**
+ * @spec https://www.w3.org/TR/2024/WD-css-text-4-20240219/#propdef-text-spacing-trim
+ */
+public class CssTextSpacingTrim extends org.w3c.css.properties.css.CssTextSpacingTrim {
+
+    private static CssIdent[] allowed_values;
+    private static CssIdent[] spacing_trim;
+
+    static {
+        String[] id_values = {"space-all", "normal", "trim-auto", "trim-start", "space-first", "trim-all"};
+        String[] other_values = {"auto"};
+        allowed_values = new CssIdent[id_values.length + other_values.length];
+        spacing_trim = new CssIdent[id_values.length];
+        int i = 0;
+        for (String s : id_values) {
+            spacing_trim[i] = CssIdent.getIdent(s);
+            allowed_values[i++] = CssIdent.getIdent(s);
+        }
+        for (String s : other_values) {
+            allowed_values[i++] = CssIdent.getIdent(s);
+        }
+    }
+
+    public static CssIdent getAllowedIdent(CssIdent ident) {
+        for (CssIdent id : allowed_values) {
+            if (id.equals(ident)) {
+                return id;
+            }
+        }
+        return null;
+    }
+
+    public static CssIdent getSpacingTrimIdent(CssIdent ident) {
+        for (CssIdent id : spacing_trim) {
+            if (id.equals(ident)) {
+                return id;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Create a new CssTextSpacingTrim
+     */
+    public CssTextSpacingTrim() {
+        value = initial;
+    }
+
+    /**
+     * Creates a new CssTextSpacingTrim
+     *
+     * @param expression The expression for this property
+     * @throws InvalidParamException Expressions are incorrect
+     */
+    public CssTextSpacingTrim(ApplContext ac, CssExpression expression, boolean check)
+            throws InvalidParamException {
+        setByUser();
+        CssValue val = expression.getValue();
+
+        if (check && expression.getCount() > 1) {
+            throw new InvalidParamException("unrecognize", ac);
+        }
+
+        if (val.getType() != CssTypes.CSS_IDENT) {
+            throw new InvalidParamException("value",
+                    expression.getValue(),
+                    getPropertyName(), ac);
+        }
+        // ident, so inherit, or allowed value
+        if (!CssIdent.isCssWide(val.getIdent()) && getAllowedIdent(val.getIdent()) == null) {
+            throw new InvalidParamException("value",
+                    expression.getValue(),
+                    getPropertyName(), ac);
+        }
+        value = val;
+        expression.next();
+    }
+
+    public CssTextSpacingTrim(ApplContext ac, CssExpression expression)
+            throws InvalidParamException {
+        this(ac, expression, false);
+    }
+
+}
+
diff --git a/org/w3c/css/properties/css3/CssTextTransform.java b/org/w3c/css/properties/css3/CssTextTransform.java
index 6f943f80c..50cbe6c3f 100644
--- a/org/w3c/css/properties/css3/CssTextTransform.java
+++ b/org/w3c/css/properties/css3/CssTextTransform.java
@@ -18,7 +18,7 @@
 import static org.w3c.css.values.CssOperator.SPACE;
 
 /**
- * @spec https://www.w3.org/TR/2021/CRD-css-text-3-20210422/#propdef-text-transform
+ * @spec https://www.w3.org/TR/2024/WD-css-text-4-20240219/#propdef-text-transform
  */
 public class CssTextTransform extends org.w3c.css.properties.css.CssTextTransform {
 
diff --git a/org/w3c/css/properties/css3/CssTextWrap.java b/org/w3c/css/properties/css3/CssTextWrap.java
new file mode 100644
index 000000000..72f6a47c6
--- /dev/null
+++ b/org/w3c/css/properties/css3/CssTextWrap.java
@@ -0,0 +1,124 @@
+//
+// Author: Yves Lafon 
+//
+// (c) COPYRIGHT World Wide Web Consortium, 2024.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.properties.css3;
+
+import org.w3c.css.parser.CssStyle;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
+import org.w3c.css.values.CssTypes;
+import org.w3c.css.values.CssValue;
+import org.w3c.css.values.CssValueList;
+
+import java.util.ArrayList;
+
+import static org.w3c.css.values.CssOperator.SPACE;
+
+/**
+ * @spec https://www.w3.org/TR/2024/WD-css-text-4-20240219/#propdef-text-wrap
+ */
+public class CssTextWrap extends org.w3c.css.properties.css.CssTextWrap {
+
+    private CssTextWrapMode _longhand_mode;
+    private CssTextWrapStyle _longhand_style;
+
+    /**
+     * Create a new CssTextWrap
+     */
+    public CssTextWrap() {
+        value = initial;
+        _longhand_mode = new CssTextWrapMode();
+        _longhand_style = new CssTextWrapStyle();
+    }
+
+    /**
+     * Creates a new CssTextWrap
+     *
+     * @param expression The expression for this property
+     * @throws InvalidParamException Expressions are incorrect
+     */
+    public CssTextWrap(ApplContext ac, CssExpression expression, boolean check)
+            throws InvalidParamException {
+        CssValue val;
+        char op;
+        ArrayList values = new ArrayList<>();
+        _longhand_mode = new CssTextWrapMode();
+        _longhand_style = new CssTextWrapStyle();
+        boolean _got_mode = false;
+        boolean _got_style = false;
+
+        if (check && expression.getCount() > 2) {
+            throw new InvalidParamException("unrecognize", ac);
+        }
+        setByUser();
+
+        for (int i = 0; i < 2 && !expression.end(); i++) {
+            val = expression.getValue();
+            op = expression.getOperator();
+
+            if (val.getType() != CssTypes.CSS_IDENT) {
+                throw new InvalidParamException("value", val,
+                        getPropertyName(), ac);
+            }
+            if (CssIdent.isCssWide(val.getIdent())) {
+                if (expression.getCount() > 1) {
+                    throw new InvalidParamException("value",
+                            expression.getValue(),
+                            getPropertyName(), ac);
+                }
+                values.add(val);
+                _longhand_mode.value = val;
+                _longhand_style.value = val;
+                break;
+            } else {
+                CssIdent id = CssTextWrapMode.getAllowedIdent(val.getIdent());
+                if (_got_mode && (id != null)) {
+                    throw new InvalidParamException("value",
+                            expression.getValue(),
+                            getPropertyName(), ac);
+                } else if (id != null) {
+                    values.add(val);
+                    _got_mode = true;
+                    _longhand_mode.value = val;
+                } else {
+                    id = CssTextWrapStyle.getAllowedIdent(val.getIdent());
+                    if (_got_style || (id == null)) {
+                        throw new InvalidParamException("value",
+                                expression.getValue(),
+                                getPropertyName(), ac);
+                    }
+                    values.add(val);
+                    _got_style = true;
+                    _longhand_style.value = val;
+                }
+            }
+            if (op != SPACE) {
+                throw new InvalidParamException("operator", op,
+                        getPropertyName(), ac);
+            }
+            expression.next();
+        }
+        value = (values.size() == 1) ? values.get(0) : new CssValueList(values);
+    }
+
+    public CssTextWrap(ApplContext ac, CssExpression expression)
+            throws InvalidParamException {
+        this(ac, expression, false);
+    }
+
+    /**
+     * Add this property to the CssStyle.
+     *
+     * @param style The CssStyle
+     */
+    public void addToStyle(ApplContext ac, CssStyle style) {
+        super.addToStyle(ac, style);
+        _longhand_mode.addToStyle(ac, style);
+        _longhand_style.addToStyle(ac, style);
+    }
+}
+
diff --git a/org/w3c/css/properties/css3/CssTextWrapMode.java b/org/w3c/css/properties/css3/CssTextWrapMode.java
new file mode 100644
index 000000000..2ee9d7f3c
--- /dev/null
+++ b/org/w3c/css/properties/css3/CssTextWrapMode.java
@@ -0,0 +1,88 @@
+//
+// Author: Yves Lafon 
+//
+// (c) COPYRIGHT World Wide Web Consortium, 2024.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.properties.css3;
+
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
+import org.w3c.css.values.CssTypes;
+import org.w3c.css.values.CssValue;
+
+/**
+ * @spec https://www.w3.org/TR/2024/WD-css-text-4-20240219/#propdef-text-wrap-mode
+ */
+public class CssTextWrapMode extends org.w3c.css.properties.css.CssTextWrapMode {
+
+    private static CssIdent[] allowed_idents;
+
+
+    static {
+
+        String id_values[] = {"wrap", "nowrap"};
+        allowed_idents = new CssIdent[id_values.length];
+        int i = 0;
+        for (String s : id_values) {
+            allowed_idents[i++] = CssIdent.getIdent(s);
+        }
+    }
+
+    public static CssIdent getAllowedIdent(CssIdent ident) {
+        for (CssIdent id : allowed_idents) {
+            if (id.equals(ident)) {
+                return id;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Create a new CssTextWrapMode
+     */
+    public CssTextWrapMode() {
+        value = initial;
+    }
+
+    /**
+     * Creates a new CssTextWrapMode
+     *
+     * @param expression The expression for this property
+     * @throws InvalidParamException Expressions are incorrect
+     */
+    public CssTextWrapMode(ApplContext ac, CssExpression expression, boolean check)
+            throws InvalidParamException {
+
+        if (check && expression.getCount() > 1) {
+            throw new InvalidParamException("unrecognize", ac);
+        }
+        setByUser();
+
+        CssValue val;
+        char op;
+
+        val = expression.getValue();
+        op = expression.getOperator();
+
+        if (val.getType() != CssTypes.CSS_IDENT) {
+            throw new InvalidParamException("value", val,
+                    getPropertyName(), ac);
+        }
+        CssIdent id = val.getIdent();
+        if (!CssIdent.isCssWide(id) && (getAllowedIdent(id) == null)) {
+            throw new InvalidParamException("value",
+                    val.toString(),
+                    getPropertyName(), ac);
+        }
+        value = val;
+        expression.next();
+    }
+
+    public CssTextWrapMode(ApplContext ac, CssExpression expression)
+            throws InvalidParamException {
+        this(ac, expression, false);
+    }
+}
+
diff --git a/org/w3c/css/properties/css3/CssTextWrapStyle.java b/org/w3c/css/properties/css3/CssTextWrapStyle.java
new file mode 100644
index 000000000..f5b64aa30
--- /dev/null
+++ b/org/w3c/css/properties/css3/CssTextWrapStyle.java
@@ -0,0 +1,87 @@
+//
+// Author: Yves Lafon 
+//
+// (c) COPYRIGHT World Wide Web Consortium, 2024.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.properties.css3;
+
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
+import org.w3c.css.values.CssTypes;
+import org.w3c.css.values.CssValue;
+
+/**
+ * @spec https://www.w3.org/TR/2024/WD-css-text-4-20240219/#propdef-text-wrap-style
+ */
+public class CssTextWrapStyle extends org.w3c.css.properties.css.CssTextWrapStyle {
+
+    private static CssIdent[] allowed_idents;
+
+    static {
+
+        String id_values[] = {"auto", "balance", "stable", "pretty"};
+        allowed_idents = new CssIdent[id_values.length];
+        int i = 0;
+        for (String s : id_values) {
+            allowed_idents[i++] = CssIdent.getIdent(s);
+        }
+    }
+
+    public static CssIdent getAllowedIdent(CssIdent ident) {
+        for (CssIdent id : allowed_idents) {
+            if (id.equals(ident)) {
+                return id;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Create a new CssTextWrapStyle
+     */
+    public CssTextWrapStyle() {
+        value = initial;
+    }
+
+    /**
+     * Creates a new CssTextWrapStyle
+     *
+     * @param expression The expression for this property
+     * @throws InvalidParamException Expressions are incorrect
+     */
+    public CssTextWrapStyle(ApplContext ac, CssExpression expression, boolean check)
+            throws InvalidParamException {
+
+        if (check && expression.getCount() > 1) {
+            throw new InvalidParamException("unrecognize", ac);
+        }
+        setByUser();
+
+        CssValue val;
+        char op;
+
+        val = expression.getValue();
+        op = expression.getOperator();
+
+        if (val.getType() != CssTypes.CSS_IDENT) {
+            throw new InvalidParamException("value", val,
+                    getPropertyName(), ac);
+        }
+        CssIdent id = val.getIdent();
+        if (!CssIdent.isCssWide(id) && (getAllowedIdent(id) == null)) {
+            throw new InvalidParamException("value",
+                    val.toString(),
+                    getPropertyName(), ac);
+        }
+        value = val;
+        expression.next();
+    }
+
+    public CssTextWrapStyle(ApplContext ac, CssExpression expression)
+            throws InvalidParamException {
+        this(ac, expression, false);
+    }
+}
+
diff --git a/org/w3c/css/properties/css3/CssTransform.java b/org/w3c/css/properties/css3/CssTransform.java
index ccbb75107..94ca86284 100644
--- a/org/w3c/css/properties/css3/CssTransform.java
+++ b/org/w3c/css/properties/css3/CssTransform.java
@@ -23,6 +23,7 @@
 
 /**
  * @spec https://www.w3.org/TR/2019/CR-css-transforms-1-20190214/#propdef-transform
+ * @spec https://www.w3.org/TR/2021/WD-css-transforms-2-20211109/#transform-functions
  */
 public class CssTransform extends org.w3c.css.properties.css.CssTransform {
 
@@ -139,11 +140,12 @@ protected static void parseFunctionValues(ApplContext ac, CssValue func, CssProp
                 parseTranslateAxisFunction(ac, function.getParameters(), caller);
                 break;
             case scale:
-                parseAtMostX(ac, function.getParameters(), 2, CssTypes.CSS_NUMBER, caller);
+                parseAtMostX(ac, function.getParameters(), 2,
+                        CssTypes.CSS_NUMBER, CssTypes.CSS_PERCENTAGE, caller);
                 break;
             case scaleX:
             case scaleY:
-                parseOneX(ac, function.getParameters(), CssTypes.CSS_NUMBER, caller);
+                parseOneX(ac, function.getParameters(), CssTypes.CSS_NUMBER, CssTypes.CSS_PERCENTAGE, caller);
                 break;
             case rotate:
                 parseOneX(ac, function.getParameters(), CssTypes.CSS_ANGLE, caller);
@@ -191,6 +193,24 @@ protected static void parseFunctionValues(ApplContext ac, CssValue func, CssProp
         }
     }
 
+    private static void parsePerspective(ApplContext ac, CssExpression expression, CssProperty caller)
+            throws InvalidParamException {
+        if (expression.getCount() > 1) {
+            throw new InvalidParamException("unrecognize", ac);
+        }
+        if (expression.getCount() == 0) {
+            throw new InvalidParamException("few-value", caller.getPropertyName(), ac);
+        }
+        CssValue val = expression.getValue();
+        if (val.getType() == CssTypes.CSS_IDENT) {
+            if (none.equals(val.getIdent())) {
+                return;
+            }
+            // if not none, it will fail later
+        }
+        parseOneX(ac, expression, CssTypes.CSS_LENGTH, caller);
+    }
+
     private static void parseExactlyNX(ApplContext ac, CssExpression expression,
                                        int n, int type, CssProperty caller)
             throws InvalidParamException {
@@ -241,6 +261,56 @@ private static void parseAtMostX(ApplContext ac, CssExpression expression,
         }
     }
 
+    // parse at most n values of type (CssTypes.XXX)
+    private static void parseAtMostX(ApplContext ac, CssExpression expression,
+                                     int atMost, int type1, int type2, CssProperty caller)
+            throws InvalidParamException {
+        if (expression.getCount() > atMost) {
+            throw new InvalidParamException("unrecognize", ac);
+        }
+        CssValue val;
+        char op;
+        while (!expression.end()) {
+            val = expression.getValue();
+            op = expression.getOperator();
+            // special case, 0 can be a length or an angle...
+            if (val.getType() == CssTypes.CSS_NUMBER) {
+                switch (type1) {
+                    case CssTypes.CSS_LENGTH:
+                        val.getLength();
+                        break;
+                    case CssTypes.CSS_ANGLE:
+                        val.getAngle();
+                    case CssTypes.CSS_NUMBER:
+                        break;
+                    default:
+                        switch (type2) {
+                            case CssTypes.CSS_LENGTH:
+                                val.getLength();
+                                break;
+                            case CssTypes.CSS_ANGLE:
+                                val.getAngle();
+                            case CssTypes.CSS_NUMBER:
+                                break;
+                            default:
+                                throw new InvalidParamException("value",
+                                        val.toString(),
+                                        caller.getPropertyName(), ac);
+                        }
+                }
+            } else if ((val.getType() != type1) && (val.getType() != type2)) {
+                throw new InvalidParamException("value",
+                        val.toString(),
+                        caller.getPropertyName(), ac);
+            }
+            expression.next();
+            if (!expression.end() && (op != COMMA)) {
+                throw new InvalidParamException("operator",
+                        Character.toString(op), ac);
+            }
+        }
+    }
+
     // parse one value of type (CssTypes.XXX)
     private static void parseOneX(ApplContext ac, CssExpression expression,
                                   int type, CssProperty caller)
@@ -254,7 +324,7 @@ private static void parseOneX(ApplContext ac, CssExpression expression,
         CssValue val;
         val = expression.getValue();
         // special case, 0 can be a length or an angle...
-        if (val.getType() == CssTypes.CSS_NUMBER) {
+        if (val.getType() == CssTypes.CSS_NUMBER && type != CssTypes.CSS_NUMBER) {
             if (type == CssTypes.CSS_LENGTH || type == CssTypes.CSS_ANGLE) {
                 // if not zero, it will fail
                 val.getCheckableValue().checkEqualsZero(ac, caller.getPropertyName());
@@ -270,6 +340,37 @@ private static void parseOneX(ApplContext ac, CssExpression expression,
         expression.next();
     }
 
+    // parse one value of type (CssTypes.XXX)
+    private static void parseOneX(ApplContext ac, CssExpression expression,
+                                  int type1, int type2, CssProperty caller)
+            throws InvalidParamException {
+        if (expression.getCount() > 1) {
+            throw new InvalidParamException("unrecognize", ac);
+        }
+        if (expression.getCount() == 0) {
+            throw new InvalidParamException("few-value", caller.getPropertyName(), ac);
+        }
+        CssValue val;
+        val = expression.getValue();
+        // special case, 0 can be a length or an angle...
+        if (val.getType() == CssTypes.CSS_NUMBER && type1 != CssTypes.CSS_NUMBER && type2 != CssTypes.CSS_NUMBER) {
+            if (type1 == CssTypes.CSS_LENGTH || type1 == CssTypes.CSS_ANGLE ||
+                    type1 == CssTypes.CSS_PERCENTAGE || type2 == CssTypes.CSS_PERCENTAGE ||
+                    type2 == CssTypes.CSS_LENGTH || type2 == CssTypes.CSS_ANGLE) {
+                // if not zero, it will fail
+                val.getCheckableValue().checkEqualsZero(ac, caller.getPropertyName());
+                expression.next();
+                return;
+            }
+        }
+        if (val.getType() != type1 && val.getType() != type2) {
+            throw new InvalidParamException("value",
+                    val.toString(),
+                    caller.getPropertyName(), ac);
+        }
+        expression.next();
+    }
+
     // special cases
 
 
diff --git a/org/w3c/css/properties/css3/CssTransformStyle.java b/org/w3c/css/properties/css3/CssTransformStyle.java
index 056cb8b5b..ceb62cb1e 100644
--- a/org/w3c/css/properties/css3/CssTransformStyle.java
+++ b/org/w3c/css/properties/css3/CssTransformStyle.java
@@ -13,7 +13,7 @@
 import org.w3c.css.values.CssValue;
 
 /**
- * @spec https://www.w3.org/TR/2020/WD-css-transforms-2-20200303/#propdef-transform-style
+ * @spec https://www.w3.org/TR/2021/WD-css-transforms-2-20211109/#propdef-transform-style
  */
 public class CssTransformStyle extends org.w3c.css.properties.css.CssTransformStyle {
 
diff --git a/org/w3c/css/properties/css3/CssTranslate.java b/org/w3c/css/properties/css3/CssTranslate.java
new file mode 100644
index 000000000..63224e554
--- /dev/null
+++ b/org/w3c/css/properties/css3/CssTranslate.java
@@ -0,0 +1,101 @@
+//
+// Author: Yves Lafon 
+//
+// (c) COPYRIGHT World Wide Web Consortium, 2025.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.properties.css3;
+
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssCheckableValue;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
+import org.w3c.css.values.CssTypes;
+import org.w3c.css.values.CssValue;
+import org.w3c.css.values.CssValueList;
+
+import java.util.ArrayList;
+
+import static org.w3c.css.values.CssOperator.SPACE;
+
+/**
+ * @spec https://www.w3.org/TR/2021/WD-css-transforms-2-20211109/#propdef-translate
+ */
+public class CssTranslate extends org.w3c.css.properties.css.CssTranslate {
+
+    /**
+     * Create a new CssTranslate
+     */
+    public CssTranslate() {
+        value = initial;
+    }
+
+    /**
+     * Creates a new CssTranslate
+     *
+     * @param expression The expression for this property
+     * @throws InvalidParamException Expressions are incorrect
+     */
+    public CssTranslate(ApplContext ac, CssExpression expression, boolean check)
+            throws InvalidParamException {
+        if (check && expression.getCount() > 3) {
+            throw new InvalidParamException("unrecognize", ac);
+        }
+        CssValue val;
+        ArrayList v = new ArrayList<>();
+        char op;
+        setByUser();
+
+
+        while (!expression.end()) {
+            val = expression.getValue();
+            op = expression.getOperator();
+
+            switch (val.getType()) {
+                case CssTypes.CSS_NUMBER:
+                    // only 0 can be a length...
+                    CssCheckableValue p = val.getCheckableValue();
+                    p.checkEqualsZero(ac, this);
+                    v.add(val);
+                    break;
+                case CssTypes.CSS_PERCENTAGE:
+                    if (v.size() == 2) {
+                        // percentage can appear only in the first two values
+                        throw new InvalidParamException("value", val.toString(),
+                                getPropertyName(), ac);
+                    }
+                case CssTypes.CSS_LENGTH:
+                    v.add(val);
+                    break;
+                case CssTypes.CSS_IDENT:
+                    CssIdent id = val.getIdent();
+                    if (none.equals(id) || CssIdent.isCssWide(id)) {
+                        if (expression.getCount() > 1) {
+                            throw new InvalidParamException("value", val.toString(),
+                                    getPropertyName(), ac);
+                        }
+                        v.add(val);
+                        break;
+                    }
+                    // unrecognize ident, let it fail
+                default:
+                    throw new InvalidParamException("value",
+                            val.toString(),
+                            getPropertyName(), ac);
+            }
+            if (op != SPACE) {
+                throw new InvalidParamException("operator",
+                        Character.toString(op), ac);
+            }
+            expression.next();
+        }
+        value = (v.size() == 1) ? v.get(0) : new CssValueList(v);
+    }
+
+
+    public CssTranslate(ApplContext ac, CssExpression expression)
+            throws InvalidParamException {
+        this(ac, expression, false);
+    }
+}
+
diff --git a/org/w3c/css/properties/css3/CssWhiteSpace.java b/org/w3c/css/properties/css3/CssWhiteSpace.java
index 88a475d9d..fa3c4c651 100644
--- a/org/w3c/css/properties/css3/CssWhiteSpace.java
+++ b/org/w3c/css/properties/css3/CssWhiteSpace.java
@@ -10,9 +10,14 @@
 import org.w3c.css.values.CssIdent;
 import org.w3c.css.values.CssTypes;
 import org.w3c.css.values.CssValue;
+import org.w3c.css.values.CssValueList;
+
+import java.util.ArrayList;
+
+import static org.w3c.css.values.CssOperator.SPACE;
 
 /**
- * @spec https://www.w3.org/TR/2021/CRD-css-text-3-20210422/#propdef-white-space
+ * @spec https://www.w3.org/TR/2024/WD-css-text-4-20240219/#propdef-white-space
  */
 public class CssWhiteSpace extends org.w3c.css.properties.css.CssWhiteSpace {
 
@@ -21,7 +26,7 @@ public class CssWhiteSpace extends org.w3c.css.properties.css.CssWhiteSpace {
 
     static {
         String[] WHITESPACE = {
-                "normal", "pre", "nowrap", "pre-wrap", "break-spaces", "pre-line"
+                "normal", "pre", "pre-wrap", "pre-line"
         };
         allowed_values = new CssIdent[WHITESPACE.length];
         int i = 0;
@@ -30,7 +35,7 @@ public class CssWhiteSpace extends org.w3c.css.properties.css.CssWhiteSpace {
         }
     }
 
-    public static final CssIdent getMatchingIdent(CssIdent ident) {
+    public static final CssIdent getSingleValueIdent(CssIdent ident) {
         for (CssIdent id : allowed_values) {
             if (id.equals(ident)) {
                 return id;
@@ -54,28 +59,87 @@ public CssWhiteSpace() {
      */
     public CssWhiteSpace(ApplContext ac, CssExpression expression, boolean check)
             throws InvalidParamException {
-
-        if (check && expression.getCount() > 1) {
+        ArrayList values = new ArrayList();
+        CssValue val;
+        CssExpression trimexp = null;
+        CssIdent id;
+        char op;
+        boolean got_collapse = false;
+        boolean got_wrap_mode = false;
+        //  we need 5 for <'white-space-collapse'> || <'text-wrap-mode'> || <'white-space-trim'>
+        // as <'white-space-trim'> can contain as much as 3 values
+        if (check && expression.getCount() > 5) {
             throw new InvalidParamException("unrecognize", ac);
         }
 
-        CssValue val = expression.getValue();
         setByUser();
 
-        if (val.getType() != CssTypes.CSS_IDENT) {
-            throw new InvalidParamException("value", expression.getValue(),
-                    getPropertyName(), ac);
+        while (!expression.end()) {
+            val = expression.getValue();
+            op = expression.getOperator();
+
+            if (val.getType() != CssTypes.CSS_IDENT) {
+                throw new InvalidParamException("value",
+                        expression.getValue(),
+                        getPropertyName(), ac);
+            }
+            // ident, so inherit, or allowed value
+            if (CssIdent.isCssWide(val.getIdent())) {
+                if (expression.getCount() > 1) {
+                    throw new InvalidParamException("value",
+                            expression.getValue(),
+                            getPropertyName(), ac);
+                }
+                values.add(val);
+            }
+            if ((id = getSingleValueIdent(val.getIdent())) != null) {
+                if (expression.getCount() > 1) {
+                    throw new InvalidParamException("value",
+                            expression.getValue(),
+                            getPropertyName(), ac);
+                }
+                values.add(val);
+            } else if ((id = CssWhiteSpaceCollapse.getAllowedIdent(val.getIdent())) != null) {
+                if (got_collapse) {
+                    throw new InvalidParamException("value",
+                            expression.getValue(),
+                            getPropertyName(), ac);
+                }
+                got_collapse = true;
+                values.add(val);
+            } else if ((id = CssTextWrapMode.getAllowedIdent(val.getIdent())) != null) {
+                if (got_wrap_mode) {
+                    throw new InvalidParamException("value",
+                            expression.getValue(),
+                            getPropertyName(), ac);
+                }
+                got_wrap_mode = true;
+                values.add(val);
+            } else if ((id = CssTextWrapMode.getAllowedIdent(val.getIdent())) != null) {
+                // TODO FIXME check if the values have to be contiguous or not
+                if (trimexp == null) {
+                    trimexp = new CssExpression();
+                }
+                trimexp.addValue(val);
+                trimexp.setOperator(op);
+            } else {
+                // nothing we know...
+                throw new InvalidParamException("value",
+                        expression.getValue(),
+                        getPropertyName(), ac);
+            }
+            if (op != SPACE) {
+                throw new InvalidParamException("operator", op,
+                        getPropertyName(), ac);
+            }
+            expression.next();
         }
-        if (CssIdent.isCssWide(val.getIdent())) {
-            value = val;
-        } else if (getMatchingIdent(val.getIdent()) != null) {
-            value = val;
-        } else {
-            throw new InvalidParamException("value", expression.getValue(),
-                    getPropertyName(), ac);
+        // we got everything, check now that the wrap-mode related values are valid
+        if (trimexp != null) {
+            values.add(CssWhiteSpaceTrim.checkWhiteSpaceTrim(ac, trimexp, this));
         }
-        expression.next();
 
+        value = (values.size() == 1) ? values.get(0) : new CssValueList(values);
     }
 
     public CssWhiteSpace(ApplContext ac, CssExpression expression)
diff --git a/org/w3c/css/properties/css3/CssWhiteSpaceCollapse.java b/org/w3c/css/properties/css3/CssWhiteSpaceCollapse.java
new file mode 100644
index 000000000..d8e3720d6
--- /dev/null
+++ b/org/w3c/css/properties/css3/CssWhiteSpaceCollapse.java
@@ -0,0 +1,87 @@
+//
+// Author: Yves Lafon 
+//
+// (c) COPYRIGHT World Wide Web Consortium, 2024.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.properties.css3;
+
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
+import org.w3c.css.values.CssTypes;
+import org.w3c.css.values.CssValue;
+
+/**
+ * @spec https://www.w3.org/TR/2024/WD-css-text-4-20240219/#propdef-white-space-collapse
+ */
+public class CssWhiteSpaceCollapse extends org.w3c.css.properties.css.CssWhiteSpaceCollapse {
+
+    private static final CssIdent[] allowed_idents;
+
+
+    static {
+        String[] id_values = {"collapse", "discard", "preserve", "preserve-breaks", "preserve-spaces", "break-spaces"};
+        allowed_idents = new CssIdent[id_values.length];
+        int i = 0;
+        for (String s : id_values) {
+            allowed_idents[i++] = CssIdent.getIdent(s);
+        }
+    }
+
+    public static CssIdent getAllowedIdent(CssIdent ident) {
+        for (CssIdent id : allowed_idents) {
+            if (id.equals(ident)) {
+                return id;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Create a new CssWhiteSpaceCollapse
+     */
+    public CssWhiteSpaceCollapse() {
+        value = initial;
+    }
+
+    /**
+     * Creates a new CssWhiteSpaceCollapse
+     *
+     * @param expression The expression for this property
+     * @throws InvalidParamException Expressions are incorrect
+     */
+    public CssWhiteSpaceCollapse(ApplContext ac, CssExpression expression, boolean check)
+            throws InvalidParamException {
+
+        if (check && expression.getCount() > 1) {
+            throw new InvalidParamException("unrecognize", ac);
+        }
+        setByUser();
+
+        CssValue val;
+        char op;
+
+        val = expression.getValue();
+        op = expression.getOperator();
+
+        if (val.getType() != CssTypes.CSS_IDENT) {
+            throw new InvalidParamException("value", val,
+                    getPropertyName(), ac);
+        }
+        CssIdent id = val.getIdent();
+        if (!CssIdent.isCssWide(id) && (getAllowedIdent(id) == null)) {
+            throw new InvalidParamException("value",
+                    val.toString(),
+                    getPropertyName(), ac);
+        }
+        value = val;
+        expression.next();
+    }
+
+    public CssWhiteSpaceCollapse(ApplContext ac, CssExpression expression)
+            throws InvalidParamException {
+        this(ac, expression, false);
+    }
+}
+
diff --git a/org/w3c/css/properties/css3/CssWhiteSpaceTrim.java b/org/w3c/css/properties/css3/CssWhiteSpaceTrim.java
new file mode 100644
index 000000000..f74cb6b68
--- /dev/null
+++ b/org/w3c/css/properties/css3/CssWhiteSpaceTrim.java
@@ -0,0 +1,134 @@
+//
+// Author: Yves Lafon 
+//
+// (c) COPYRIGHT World Wide Web Consortium, 2024.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.properties.css3;
+
+import org.w3c.css.properties.css.CssProperty;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
+import org.w3c.css.values.CssTypes;
+import org.w3c.css.values.CssValue;
+import org.w3c.css.values.CssValueList;
+
+import java.util.ArrayList;
+
+import static org.w3c.css.values.CssOperator.SPACE;
+
+/**
+ * @spec https://www.w3.org/TR/2024/WD-css-text-4-20240219/#propdef-white-space-trim
+ */
+public class CssWhiteSpaceTrim extends org.w3c.css.properties.css.CssWhiteSpaceTrim {
+
+    private final static CssIdent[] allowed_values;
+
+    static {
+        String[] id_values = {"discard-before", "discard-after", "discard-inner"};
+        allowed_values = new CssIdent[id_values.length];
+        int i = 0;
+        for (String s : id_values) {
+            allowed_values[i++] = CssIdent.getIdent(s);
+        }
+    }
+
+    public static CssIdent getAllowedIdent(CssIdent ident) {
+        for (CssIdent id : allowed_values) {
+            if (id.equals(ident)) {
+                return id;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Create a new CssWhiteSpaceTrim
+     */
+    public CssWhiteSpaceTrim() {
+        value = initial;
+    }
+
+    /**
+     * Creates a new CssWhiteSpaceTrim
+     *
+     * @param expression The expression for this property
+     * @throws InvalidParamException Expressions are incorrect
+     */
+    public CssWhiteSpaceTrim(ApplContext ac, CssExpression expression, boolean check)
+            throws InvalidParamException {
+        setByUser();
+
+        if (check && expression.getCount() > 3) {
+            throw new InvalidParamException("unrecognize", ac);
+        }
+
+        value = checkWhiteSpaceTrim(ac, expression, this);
+    }
+
+    public CssWhiteSpaceTrim(ApplContext ac, CssExpression expression)
+            throws InvalidParamException {
+        this(ac, expression, false);
+    }
+
+    public static CssValue checkWhiteSpaceTrim(ApplContext ac, CssExpression expression, CssProperty caller)
+            throws InvalidParamException {
+        ArrayList values = new ArrayList();
+        CssValue val;
+        CssIdent id;
+        char op;
+
+        if (expression.getCount() > 3) {
+            throw new InvalidParamException("unrecognize", ac);
+        }
+
+        while (!expression.end()) {
+            val = expression.getValue();
+            op = expression.getOperator();
+
+            if (val.getType() != CssTypes.CSS_IDENT) {
+                throw new InvalidParamException("value",
+                        expression.getValue(),
+                        caller.getPropertyName(), ac);
+            }
+            // ident, so inherit, or allowed value
+            if (CssIdent.isCssWide(val.getIdent())) {
+                if (expression.getCount() > 1) {
+                    throw new InvalidParamException("value",
+                            expression.getValue(),
+                            caller.getPropertyName(), ac);
+                }
+                values.add(val);
+            } else if (none.equals(val.getIdent())) {
+                if (expression.getCount() > 1) {
+                    throw new InvalidParamException("value",
+                            expression.getValue(),
+                            caller.getPropertyName(), ac);
+                }
+                values.add(val);
+            } else if ((id = getAllowedIdent(val.getIdent())) != null) {
+                // check for duplicates.
+                // TODO Should it be a warning instead?
+                if (values.contains(id)) {
+                    throw new InvalidParamException("value",
+                            expression.getValue(),
+                            caller.getPropertyName(), ac);
+                }
+                values.add(val);
+            } else {
+                throw new InvalidParamException("value",
+                        expression.getValue(),
+                        caller.getPropertyName(), ac);
+            }
+            if (op != SPACE) {
+                throw new InvalidParamException("operator", op,
+                        caller.getPropertyName(), ac);
+            }
+            expression.next();
+        }
+        return (values.size() == 1) ? values.get(0) : new CssValueList(values);
+    }
+
+}
+
diff --git a/org/w3c/css/properties/css3/CssWordBreak.java b/org/w3c/css/properties/css3/CssWordBreak.java
index 2581fc8a5..067739109 100644
--- a/org/w3c/css/properties/css3/CssWordBreak.java
+++ b/org/w3c/css/properties/css3/CssWordBreak.java
@@ -13,7 +13,7 @@
 import org.w3c.css.values.CssValue;
 
 /**
- * @spec https://www.w3.org/TR/2021/CRD-css-text-3-20210422/#propdef-word-break
+ * @spec https://www.w3.org/TR/2024/WD-css-text-4-20240219/#propdef-word-break
  */
 public class CssWordBreak extends org.w3c.css.properties.css.CssWordBreak {
 
@@ -21,8 +21,8 @@ public class CssWordBreak extends org.w3c.css.properties.css.CssWordBreak {
     public static final CssIdent break_word;
 
     static {
-        String[] _allowed_values = {"normal", "keep-all", "break-all",
-                "break-word"};
+        String[] _allowed_values = {"normal", "break-all", "keep-all", "manual",
+                "auto-phrase", "break-word"};
         allowed_values = new CssIdent[_allowed_values.length];
         int i = 0;
         for (String s : _allowed_values) {
diff --git a/org/w3c/css/properties/css3/CssWordSpaceTransform.java b/org/w3c/css/properties/css3/CssWordSpaceTransform.java
new file mode 100644
index 000000000..d0b9d92ea
--- /dev/null
+++ b/org/w3c/css/properties/css3/CssWordSpaceTransform.java
@@ -0,0 +1,130 @@
+//
+// Author: Yves Lafon 
+//
+// (c) COPYRIGHT World Wide Web Consortium, 2024.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.properties.css3;
+
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
+import org.w3c.css.values.CssTypes;
+import org.w3c.css.values.CssValue;
+import org.w3c.css.values.CssValueList;
+
+import java.util.ArrayList;
+
+import static org.w3c.css.values.CssOperator.SPACE;
+
+/**
+ * @spec https://www.w3.org/TR/2024/WD-css-text-4-20240219/#propdef-word-space-transform
+ */
+public class CssWordSpaceTransform extends org.w3c.css.properties.css.CssWordSpaceTransform {
+
+    private static CssIdent[] allowed_action_values;
+    private static CssIdent autoPhrase;
+
+
+    static {
+        autoPhrase = CssIdent.getIdent("auto-phrase");
+
+        String id_values[] = {"space", "ideographic-space"};
+        allowed_action_values = new CssIdent[id_values.length];
+        int i = 0;
+        for (String s : id_values) {
+            allowed_action_values[i++] = CssIdent.getIdent(s);
+        }
+    }
+
+    public static CssIdent getMatchingMainIdent(CssIdent ident) {
+        for (CssIdent id : allowed_action_values) {
+            if (id.equals(ident)) {
+                return id;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Create a new CssWordSpaceTransform
+     */
+    public CssWordSpaceTransform() {
+        value = initial;
+    }
+
+    /**
+     * Creates a new CssWordSPaceTransform
+     *
+     * @param expression The expression for this property
+     * @throws InvalidParamException
+     *          Expressions are incorrect
+     */
+    public CssWordSpaceTransform(ApplContext ac, CssExpression expression, boolean check)
+            throws InvalidParamException {
+        setByUser();
+        CssValue val = expression.getValue();
+        char op;
+        ArrayList values = new ArrayList<>();
+        boolean got_main = false;
+        boolean got_auto = false;
+
+        if (check && expression.getCount() > 2) {
+            throw new InvalidParamException("unrecognize", ac);
+        }
+
+        while (!expression.end()) {
+            val = expression.getValue();
+            op = expression.getOperator();
+
+            if (val.getType() != CssTypes.CSS_IDENT) {
+                throw new InvalidParamException("value",
+                        expression.getValue(),
+                        getPropertyName(), ac);
+            }
+            // ident, so inherit, or allowed value
+            if (CssIdent.isCssWide(val.getIdent())) {
+                if (expression.getCount() > 1) {
+                    throw new InvalidParamException("value",
+                            expression.getValue(),
+                            getPropertyName(), ac);
+                }
+                values.add(val);
+            } else if (none.equals(val.getIdent())) {
+                if (expression.getCount() > 1) {
+                    throw new InvalidParamException("value",
+                            expression.getValue(),
+                            getPropertyName(), ac);
+                }
+                values.add(val);
+            } else if (autoPhrase.equals(val.getIdent()) && !got_auto) {
+                got_auto = true;
+                values.add(val);
+            } else if (!got_main) {
+                if (getMatchingMainIdent(val.getIdent()) == null) {
+                    throw new InvalidParamException("value",
+                            expression.getValue(),
+                            getPropertyName(), ac);
+                }
+                got_main = true;
+                values.add(val);
+            } else {
+                throw new InvalidParamException("value",
+                        expression.getValue(),
+                        getPropertyName(), ac);
+            }
+            if (op != SPACE) {
+                throw new InvalidParamException("operator", op,
+                        getPropertyName(), ac);
+            }
+            expression.next();
+        }
+        value = (values.size() == 1) ? values.get(0) : new CssValueList(values);
+    }
+
+    public CssWordSpaceTransform(ApplContext ac, CssExpression expression)
+            throws InvalidParamException {
+        this(ac, expression, false);
+    }
+}
+
diff --git a/org/w3c/css/properties/css3/CssWordSpacing.java b/org/w3c/css/properties/css3/CssWordSpacing.java
index f685492d7..a11942f66 100644
--- a/org/w3c/css/properties/css3/CssWordSpacing.java
+++ b/org/w3c/css/properties/css3/CssWordSpacing.java
@@ -16,7 +16,7 @@
 import java.util.ArrayList;
 
 /**
- * @spec https://www.w3.org/TR/2021/CRD-css-text-3-20210422/#word-spacing-property
+ * @spec https://www.w3.org/TR/2024/WD-css-text-4-20240219/#propdef-word-spacing
  */
 public class CssWordSpacing extends org.w3c.css.properties.css.CssWordSpacing {
 
diff --git a/org/w3c/css/properties/css3/CssWrapAfter.java b/org/w3c/css/properties/css3/CssWrapAfter.java
new file mode 100644
index 000000000..6ac05b8c9
--- /dev/null
+++ b/org/w3c/css/properties/css3/CssWrapAfter.java
@@ -0,0 +1,87 @@
+//
+// Author: Yves Lafon 
+//
+// (c) COPYRIGHT World Wide Web Consortium, 2024.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.properties.css3;
+
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
+import org.w3c.css.values.CssTypes;
+import org.w3c.css.values.CssValue;
+
+/**
+ * @spec https://www.w3.org/TR/2024/WD-css-text-4-20240219/#propdef-wrap-after
+ */
+public class CssWrapAfter extends org.w3c.css.properties.css.CssWrapAfter {
+
+    private static final CssIdent[] allowed_idents;
+
+
+    static {
+        String[] id_values = {"auto", "avoid", "avoid-line", "avoid-flex", "line", "flex"};
+        allowed_idents = new CssIdent[id_values.length];
+        int i = 0;
+        for (String s : id_values) {
+            allowed_idents[i++] = CssIdent.getIdent(s);
+        }
+    }
+
+    public static CssIdent getAllowedIdent(CssIdent ident) {
+        for (CssIdent id : allowed_idents) {
+            if (id.equals(ident)) {
+                return id;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Create a new CssWrapAfter
+     */
+    public CssWrapAfter() {
+        value = initial;
+    }
+
+    /**
+     * Creates a new CssWrapAfter
+     *
+     * @param expression The expression for this property
+     * @throws InvalidParamException Expressions are incorrect
+     */
+    public CssWrapAfter(ApplContext ac, CssExpression expression, boolean check)
+            throws InvalidParamException {
+
+        if (check && expression.getCount() > 1) {
+            throw new InvalidParamException("unrecognize", ac);
+        }
+        setByUser();
+
+        CssValue val;
+        char op;
+
+        val = expression.getValue();
+        op = expression.getOperator();
+
+        if (val.getType() != CssTypes.CSS_IDENT) {
+            throw new InvalidParamException("value", val,
+                    getPropertyName(), ac);
+        }
+        CssIdent id = val.getIdent();
+        if (!CssIdent.isCssWide(id) && (getAllowedIdent(id) == null)) {
+            throw new InvalidParamException("value",
+                    val.toString(),
+                    getPropertyName(), ac);
+        }
+        value = val;
+        expression.next();
+    }
+
+    public CssWrapAfter(ApplContext ac, CssExpression expression)
+            throws InvalidParamException {
+        this(ac, expression, false);
+    }
+}
+
diff --git a/org/w3c/css/properties/css3/CssWrapBefore.java b/org/w3c/css/properties/css3/CssWrapBefore.java
new file mode 100644
index 000000000..ed29f01ab
--- /dev/null
+++ b/org/w3c/css/properties/css3/CssWrapBefore.java
@@ -0,0 +1,70 @@
+//
+// Author: Yves Lafon 
+//
+// (c) COPYRIGHT World Wide Web Consortium, 2024.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.properties.css3;
+
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
+import org.w3c.css.values.CssTypes;
+import org.w3c.css.values.CssValue;
+
+/**
+ * @spec https://www.w3.org/TR/2024/WD-css-text-4-20240219/#propdef-wrap-before
+ */
+public class CssWrapBefore extends org.w3c.css.properties.css.CssWrapBefore {
+    /* See @CssWrapAfter */
+    public static CssIdent getAllowedIdent(CssIdent ident) {
+        return CssWrapAfter.getAllowedIdent(ident);
+    }
+
+    /**
+     * Create a new CssWrapBefore
+     */
+    public CssWrapBefore() {
+        value = initial;
+    }
+
+    /**
+     * Creates a new CssWrapBefore
+     *
+     * @param expression The expression for this property
+     * @throws InvalidParamException Expressions are incorrect
+     */
+    public CssWrapBefore(ApplContext ac, CssExpression expression, boolean check)
+            throws InvalidParamException {
+
+        if (check && expression.getCount() > 1) {
+            throw new InvalidParamException("unrecognize", ac);
+        }
+        setByUser();
+
+        CssValue val;
+        char op;
+
+        val = expression.getValue();
+        op = expression.getOperator();
+
+        if (val.getType() != CssTypes.CSS_IDENT) {
+            throw new InvalidParamException("value", val,
+                    getPropertyName(), ac);
+        }
+        CssIdent id = val.getIdent();
+        if (!CssIdent.isCssWide(id) && (getAllowedIdent(id) == null)) {
+            throw new InvalidParamException("value",
+                    val.toString(),
+                    getPropertyName(), ac);
+        }
+        value = val;
+        expression.next();
+    }
+
+    public CssWrapBefore(ApplContext ac, CssExpression expression)
+            throws InvalidParamException {
+        this(ac, expression, false);
+    }
+}
+
diff --git a/org/w3c/css/properties/css3/CssWrapInside.java b/org/w3c/css/properties/css3/CssWrapInside.java
new file mode 100644
index 000000000..f4cc49feb
--- /dev/null
+++ b/org/w3c/css/properties/css3/CssWrapInside.java
@@ -0,0 +1,88 @@
+//
+// Author: Yves Lafon 
+//
+// (c) COPYRIGHT World Wide Web Consortium, 2024.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.properties.css3;
+
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
+import org.w3c.css.values.CssTypes;
+import org.w3c.css.values.CssValue;
+
+/**
+ * @spec https://www.w3.org/TR/2024/WD-css-text-4-20240219/#propdef-wrap-inside
+ */
+public class CssWrapInside extends org.w3c.css.properties.css.CssWrapInside {
+
+    private static CssIdent[] allowed_idents;
+
+
+    static {
+
+        String[] id_values = {"auto", "avoid"};
+        allowed_idents = new CssIdent[id_values.length];
+        int i = 0;
+        for (String s : id_values) {
+            allowed_idents[i++] = CssIdent.getIdent(s);
+        }
+    }
+
+    public static CssIdent getAllowedIdent(CssIdent ident) {
+        for (CssIdent id : allowed_idents) {
+            if (id.equals(ident)) {
+                return id;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Create a new CssWrapInside
+     */
+    public CssWrapInside() {
+        value = initial;
+    }
+
+    /**
+     * Creates a new CssWrapInside
+     *
+     * @param expression The expression for this property
+     * @throws InvalidParamException Expressions are incorrect
+     */
+    public CssWrapInside(ApplContext ac, CssExpression expression, boolean check)
+            throws InvalidParamException {
+
+        if (check && expression.getCount() > 1) {
+            throw new InvalidParamException("unrecognize", ac);
+        }
+        setByUser();
+
+        CssValue val;
+        char op;
+
+        val = expression.getValue();
+        op = expression.getOperator();
+
+        if (val.getType() != CssTypes.CSS_IDENT) {
+            throw new InvalidParamException("value", val,
+                    getPropertyName(), ac);
+        }
+        CssIdent id = val.getIdent();
+        if (!CssIdent.isCssWide(id) && (getAllowedIdent(id) == null)) {
+            throw new InvalidParamException("value",
+                    val.toString(),
+                    getPropertyName(), ac);
+        }
+        value = val;
+        expression.next();
+    }
+
+    public CssWrapInside(ApplContext ac, CssExpression expression)
+            throws InvalidParamException {
+        this(ac, expression, false);
+    }
+}
+
diff --git a/org/w3c/css/properties/css3/fontface/CssUnicodeRange.java b/org/w3c/css/properties/css3/fontface/CssUnicodeRange.java
index 421a5c0e8..5e8f3b97e 100644
--- a/org/w3c/css/properties/css3/fontface/CssUnicodeRange.java
+++ b/org/w3c/css/properties/css3/fontface/CssUnicodeRange.java
@@ -8,9 +8,9 @@
 import org.w3c.css.util.ApplContext;
 import org.w3c.css.util.InvalidParamException;
 import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssLayerList;
 import org.w3c.css.values.CssTypes;
 import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssValueList;
 
 import java.util.ArrayList;
 
@@ -36,16 +36,12 @@ public CssUnicodeRange() {
      */
     public CssUnicodeRange(ApplContext ac, CssExpression expression, boolean check)
             throws InvalidParamException {
-        if (check && expression.getCount() > 2) {
-            throw new InvalidParamException("unrecognize", ac);
-        }
-
-        setByUser();
-
         char op;
         CssValue val;
         ArrayList values = new ArrayList<>();
 
+        setByUser();
+
         while (!expression.end()) {
             val = expression.getValue();
             op = expression.getOperator();
@@ -65,12 +61,11 @@ public CssUnicodeRange(ApplContext ac, CssExpression expression, boolean check)
                 throw new InvalidParamException("operator",
                         Character.toString(op), ac);
             }
-            expression.next();
         }
         if (values.isEmpty()) {
             throw new InvalidParamException("few-value", getPropertyName(), ac);
         }
-        value = (values.size() == 1) ? values.get(0) : new CssValueList(values);
+        value = (values.size() == 1) ? values.get(0) : new CssLayerList(values);
     }
 
     public CssUnicodeRange(ApplContext ac, CssExpression expression)
diff --git a/org/w3c/css/properties/svg/SVGBasicStyle.java b/org/w3c/css/properties/svg/SVGBasicStyle.java
index fca769538..a3402afb7 100644
--- a/org/w3c/css/properties/svg/SVGBasicStyle.java
+++ b/org/w3c/css/properties/svg/SVGBasicStyle.java
@@ -17,7 +17,6 @@
 import org.w3c.css.properties.css.CssFillOpacity;
 import org.w3c.css.properties.css.CssGlyphOrientationHorizontal;
 import org.w3c.css.properties.css.CssGlyphOrientationVertical;
-import org.w3c.css.properties.css.CssImageRendering;
 import org.w3c.css.properties.css.CssKerning;
 import org.w3c.css.properties.css.CssMask;
 import org.w3c.css.properties.css.CssPointerEvents;
@@ -34,7 +33,6 @@ public class SVGBasicStyle extends SVGTinyStyle {
     public CssColorRendering cssColorRendering;
     public CssShapeRendering cssShapeRendering;
     public CssTextRendering cssTextRendering;
-    public CssImageRendering cssImageRendering;
     public CssTextAnchor cssTextAnchor;
     public CssFillOpacity cssFillOpacity;
     public CssStrokeOpacity cssStrokeOpacity;
@@ -59,15 +57,6 @@ public CssColorInterpolation getColorInterpolation() {
         return cssColorInterpolation;
     }
 
-    public CssImageRendering getImageRendering() {
-        if (cssImageRendering == null) {
-            cssImageRendering =
-                    (CssImageRendering) style.CascadingOrder(new CssImageRendering(),
-                            style, selector);
-        }
-        return cssImageRendering;
-    }
-
     public CssColorRendering getColorRendering() {
         if (cssColorRendering == null) {
             cssColorRendering =
diff --git a/org/w3c/css/servlet/CssValidator.java b/org/w3c/css/servlet/CssValidator.java
index 7cbd2aa40..c79e3b125 100644
--- a/org/w3c/css/servlet/CssValidator.java
+++ b/org/w3c/css/servlet/CssValidator.java
@@ -46,6 +46,7 @@
 import java.io.PrintWriter;
 import java.net.ProtocolException;
 import java.net.URL;
+import java.nio.charset.Charset;
 
 /**
  * This class is a servlet to use the validator.
@@ -65,6 +66,7 @@ public final class CssValidator extends HttpServlet {
 
     final static String opt_file = "file";
     final static String opt_text = "text";
+    final static String opt_textcharset = "textcharset";
     final static String opt_lang = "lang";
     final static String opt_output = "output";
     final static String opt_warning = "warning";
@@ -75,7 +77,7 @@ public final class CssValidator extends HttpServlet {
     final static String opt_type = "type";
 
     public final static String server_name =
-            "Jigsaw/2.3.0 W3C_CSS_Validator_JFouffa/2.0 (See )";
+            "Jigsaw/2.3.0 W3C_CSS_Validator_JFouffa/2.0 (See )";
 
     final static String headers_name = "X-W3C-Validator-";
 
@@ -517,6 +519,7 @@ public void doPost(HttpServletRequest req, HttpServletResponse res)
         CssParser parser = null;
         FakeFile file = null;
         String text = null;
+        Charset textcharset = null;
         String output = null;
         //boolean XMLinput = false;
         String warning = null;
@@ -584,6 +587,9 @@ public void doPost(HttpServletRequest req, HttpServletResponse res)
                     case opt_text:
                         text = (String) pair.getValue();
                         break;
+                    case opt_textcharset:
+                        textcharset = (Charset) pair.getValue();
+                        break;
                     case opt_lang:
                         lang = (String) pair.getValue();
                         break;
@@ -688,7 +694,7 @@ public void doPost(HttpServletRequest req, HttpServletResponse res)
                 handleScam(ac, text, res, output, warningLevel, errorReport);
                 return;
             }
-            ac.setFakeText(text);
+            ac.setFakeText(text, textcharset);
             fileName = "TextArea";
             Util.verbose("- " + fileName + " Data -");
             Util.verbose(text);
@@ -717,7 +723,7 @@ public void doPost(HttpServletRequest req, HttpServletResponse res)
             if (isCSS) {
                 //if CSS:
                 parser = new StyleSheetParser(ac);
-                parser.parseStyleElement(ac, is, null, ac.getMedium(),
+                parser.parseStyleElement(ac, is, textcharset, null, ac.getMedium(),
                         new URL(fileName), 0);
 
                 handleRequest(ac, res, fileName, parser.getStyleSheet(),
diff --git a/org/w3c/css/servlet/error.html b/org/w3c/css/servlet/error.html
index 438883b2d..b99271fa9 100644
--- a/org/w3c/css/servlet/error.html
+++ b/org/w3c/css/servlet/error.html
@@ -9,7 +9,7 @@
 
   
     

-      
+      
     

     

     
CSS
diff --git a/org/w3c/css/util/ApplContext.java b/org/w3c/css/util/ApplContext.java
index 9edd934ec..f6f919bcb 100644
--- a/org/w3c/css/util/ApplContext.java
+++ b/org/w3c/css/util/ApplContext.java
@@ -54,12 +54,15 @@ private BomEncoding(Charset c, boolean fb) {
             uriCharset = c;
             fromBom = fb;
         }
+
         private BomEncoding(Charset c) {
             this(c, false);
         }
+
         private BomEncoding() {
         }
     }
+
     // charset definition of traversed URLs
     private HashMap uricharsets = null;
 
@@ -72,6 +75,9 @@ private BomEncoding() {
 
     private ArrayList linkedmedia = new ArrayList();
 
+    int readTimeout = 60000; // ms
+    int connectTimeout = 5000; // ms
+
     String credential = null;
     String lang;
     Messages msgs;
@@ -103,6 +109,7 @@ public void setFollowlinks(boolean followlinks) {
 
     FakeFile fakefile = null;
     String faketext = null;
+    Charset faketextcharset = null;
     URL fakeurl = null;
 
     URL referrer = null;
@@ -321,7 +328,6 @@ public boolean getTreatVendorExtensionsAsWarnings() {
      * Change the behaviour of error reporting for vendor extensions.
      *
      * @param treatVendorExtensionsAsWarnings
-     *
      */
     public void setTreatVendorExtensionsAsWarnings(
             boolean treatVendorExtensionsAsWarnings) {
@@ -508,23 +514,29 @@ public void setFakeFile(FakeFile fakefile) {
     /**
      * store content of entered text
      */
-    public void setFakeText(String faketext) {
+    public void setFakeText(String faketext, Charset faketextcharset) {
         this.faketext = faketext;
+        this.faketextcharset = faketextcharset;
+
     }
 
     public InputStream getFakeInputStream(URL source)
             throws IOException {
         InputStream is = null;
+        Charset c = null;
         if (fakefile != null) {
             is = fakefile.getInputStream();
         }
         if (faketext != null) {
-            is = new ByteArrayInputStream(faketext.getBytes());
+            is = new ByteArrayInputStream(faketext.getBytes(faketextcharset));
+            c = faketextcharset;
         }
         if (is == null) {
             return null;
         }
-        Charset c = getCharsetObjForURL(source);
+        if (c == null) {
+            c = getCharsetObjForURL(source);
+        }
         if (c == null) {
             UnicodeInputStream uis = new UnicodeInputStream(is);
             String guessedCharset = uis.getEncodingFromStream();
@@ -586,6 +598,9 @@ public boolean isNamespaceDefined(URL url, String prefix) {
             return true;
         }
         String realPrefix = (!prefix.isEmpty()) ? prefix : defaultPrefix;
+        if (namespaces == null) { // no ns defined -> fail
+            return false;
+        }
         HashMap nsdefs = namespaces.get(url);
         if (nsdefs == null) {
             return false;
@@ -610,4 +625,20 @@ public void setReferrer(URL referrer) {
     public URL getReferrer() {
         return referrer;
     }
+
+    public int getReadTimeout() {
+        return readTimeout;
+    }
+
+    public void setReadTimeout(int timeout) {
+        readTimeout = timeout;
+    }
+
+    public int getConnectTimeout() {
+        return connectTimeout;
+    }
+
+    public void setConnectTimeout(int timeout) {
+        connectTimeout = timeout;
+    }
 }
diff --git a/org/w3c/css/util/Codecs.java b/org/w3c/css/util/Codecs.java
index 2dcd35455..5da1bb42c 100644
--- a/org/w3c/css/util/Codecs.java
+++ b/org/w3c/css/util/Codecs.java
@@ -42,6 +42,9 @@
 import org.apache.commons.lang3.tuple.Pair;
 
 import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.charset.CharacterCodingException;
+import java.nio.charset.CharsetDecoder;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 
@@ -110,7 +113,7 @@ private Codecs() {
      * @throws IOException If any file operation fails.
      */
     public final static synchronized ArrayList> mpFormDataDecode(byte[] data,
-                                                                                      String cont_type)
+                                                                                 String cont_type)
             throws IOException {
 
         ArrayList> pList = new ArrayList<>();
@@ -318,9 +321,25 @@ private Codecs() {
 
                 value = file;
             } else {                    // It's simple data
-                value = new String(data, start, end - start);
+                if (name.equals("text")) {
+                    try {
+                        CharsetDecoder decoder = StandardCharsets.UTF_8.newDecoder();
+                        decoder.decode(ByteBuffer.wrap(data, start, end - start));
+                        value = new String(data, start, end - start, StandardCharsets.UTF_8);
+                        pList.add(new ImmutablePair<>("textcharset", StandardCharsets.UTF_8));
+                    } catch (CharacterCodingException ignoredEx) {
+                        value = new String(data, start, end - start, StandardCharsets.ISO_8859_1);
+                        pList.add(new ImmutablePair<>("textcharset", StandardCharsets.ISO_8859_1));
+                    }
+                } else {
+                    value = new String(data, start, end - start, StandardCharsets.ISO_8859_1);
+                }
+                //               value = new String(data, start, end - start);
+            }
+            // reserved name for fake text charset
+            if (!name.equals("textcharset")) {
+                pList.add(new ImmutablePair<>(name, value));
             }
-            pList.add(new ImmutablePair<>(name, value));
             if (debugMode) {
                 System.err.println("[ADD " + name + ',' + value + ','
                         + value.getClass() + ']');
diff --git a/org/w3c/css/util/HTTPURL.java b/org/w3c/css/util/HTTPURL.java
index cf5ba48aa..1949fb5dd 100644
--- a/org/w3c/css/util/HTTPURL.java
+++ b/org/w3c/css/util/HTTPURL.java
@@ -226,6 +226,10 @@ private static URLConnection getConnection(URL url, URL referrer, int count,
                 System.err.println("with [" + ac.getCredential() + ']');
             }
         }
+        // setting timeouts
+        urlC.setConnectTimeout(ac.getConnectTimeout());
+        urlC.setReadTimeout(ac.getReadTimeout());
+
         // avoid all kind of caches
         urlC.setRequestProperty("Pragma", "no-cache");
         urlC.setRequestProperty("Cache-Control", "no-cache, no-store");
@@ -289,7 +293,7 @@ private static URLConnection getConnection(URL url, URL referrer, int count,
                     } catch (Exception ex) {
                         // usually a NPE when Location is absent on a redirect.
                         // in any case, we will count this as non existent result.
-                        throw new FileNotFoundException(url + ":" + " Error in "+status);
+                        throw new FileNotFoundException(url + ":" + " Error in " + status);
                     } finally {
                         httpURL.disconnect();
                     }
diff --git a/org/w3c/css/util/Messages.properties.bg b/org/w3c/css/util/Messages.properties.bg
index 2ba98ccad..405a2a28e 100644
--- a/org/w3c/css/util/Messages.properties.bg
+++ b/org/w3c/css/util/Messages.properties.bg
@@ -54,7 +54,7 @@ validate_by_input: Валидиране чрез директно въвежда
 enter_CSS: Въведете CSS, който желаете да се валидира
 submit_input: Изпратете въведеното за валидиране
 note: Пояснение
-note_xhtml_valid: Ако желаете да валидирате CSS style sheet, вписана в (X)HTML документ, трябва първо да проверите дали използваният (X)HTML е валиден
+note_xhtml_valid: Ако желаете да валидирате CSS style sheet, вписана в (X)HTML документ, трябва първо да проверите дали използваният (X)HTML е валиден
 # End of variables added along with Index page template
 
 W3C_validator_results: Резултати на W3C CSS Validator за
@@ -88,7 +88,7 @@ no_errors_create_link_msg: Ако желаете да създадете лин
 на други да валидират страницата Ви, URI е:
 no_errors_forHTML_only_msg: само за HTML/XML документ
 no_errors_bookmark_msg: Или, можете просто да добавите настоящата страница към Вашите bookmarks или hotlist.
-note_valide_html: За да функционира според очакванията, Вашият CSS style sheet се нуждае от правилно дърво за парсване на документа. Това означава, че трябва да изпозлвате валиден HTML.
+note_valide_html: За да функционира според очакванията, Вашият CSS style sheet се нуждае от правилно дърво за парсване на документа. Това означава, че трябва да изпозлвате валиден HTML.
 top: Горе
 # hook_html_validator 
 not-css1-style: /* ВНИМАВАЙТЕ ! Това не е CSS1 свойство ! */
diff --git a/org/w3c/css/util/Messages.properties.cs b/org/w3c/css/util/Messages.properties.cs
index fff6dfc99..2144be300 100644
--- a/org/w3c/css/util/Messages.properties.cs
+++ b/org/w3c/css/util/Messages.properties.cs
@@ -55,7 +55,7 @@
 enter_CSS: Zadejte CSS, kterou chcete ověřit
 submit_input: Potvrďte vstup pro ověření
 note: Poznámka
-note_xhtml_valid: Pokud chcete ověřit svůj CSS styl vložený do dokumentu (X)HTML měli byste nejprve zkontrolovat  , že vámi použité (X)HTML je platné 
+note_xhtml_valid: Pokud chcete ověřit svůj CSS styl vložený do dokumentu (X)HTML měli byste nejprve zkontrolovat  , že vámi použité (X)HTML je platné 
 # Konec proměnných přidaných společně se stránkou šablony
 
 W3C_validator_results:Validátor výsledků W3C CSS
@@ -83,7 +83,7 @@
 no_errors_create_link_msg: Chcete-li vytvořit odkaz na tuto stránku (tj. tento výsledek ověření ) znovuověření této stránky v budoucnosti nebo umožněte ostatním ověřit vaši stránku, URI je:
 no_errors_forHTML_only_msg: pouze pro dokument HTML/XML
 no_errors_bookmark_msg: Nebo stačí, když přidáte aktuální stránku do záložky nebo do oblíbených.
-note_valide_html: Aby tabulka stylů CSS fungovala jak chcete, musí mít správnou syntaxi. To znamená, že byste měli použít valid HTML.
+note_valide_html: Aby tabulka stylů CSS fungovala jak chcete, musí mít správnou syntaxi. To znamená, že byste měli použít valid HTML.
 top: Nahoru
 # hook_html_validator 
 not-css1-style: /* POZOR ! Toto není vlastnost CSS1! */
diff --git a/org/w3c/css/util/Messages.properties.de b/org/w3c/css/util/Messages.properties.de
index 6fa94e81d..500eea938 100644
--- a/org/w3c/css/util/Messages.properties.de
+++ b/org/w3c/css/util/Messages.properties.de
@@ -57,7 +57,7 @@ validate_by_input: Validierung per Direkteingabe
 enter_CSS: Geben Sie den CSS Code ein, den Sie überprüfen möchten
 submit_input: Code validieren
 note: Achtung
-note_xhtml_valid: Wenn Sie CSS-Code in einem (X)HTML-Dokument validieren möchten, sollten Sie zunächst prüfen, ob das (X)HTML-Dokument valide ist
+note_xhtml_valid: Wenn Sie CSS-Code in einem (X)HTML-Dokument validieren möchten, sollten Sie zunächst prüfen, ob das (X)HTML-Dokument valide ist
 # End of variables added along with Index page template
 
 W3C_validator_results: Ergebnisse des CSS-Validators 
@@ -92,7 +92,7 @@ Seite zu erleichtern oder um es anderen zu ermöglichen Ihre Seite zu \
 validieren, so verwenden Sie folgenden URI:
 no_errors_forHTML_only_msg: nur für HTML/XML-Dokumente
 no_errors_bookmark_msg: Sie können die aktuelle Seite auch einfach in Ihre Bookmarks aufnehmen.
-note_valide_html: Damit das Programm richtig funktioniert, benötigt Ihr CSS style sheet einen korrekten Dokument-Syntaxbaum. Das bedeutet, dass Sie gültiges HTML verwenden sollten.
+note_valide_html: Damit das Programm richtig funktioniert, benötigt Ihr CSS style sheet einen korrekten Dokument-Syntaxbaum. Das bedeutet, dass Sie gültiges HTML verwenden sollten.
 top: Top
 # hook_html_validator 
 not-css1-style: /* Vorsicht: Dies ist keine CSS1-Eigenschaft! */
diff --git a/org/w3c/css/util/Messages.properties.el b/org/w3c/css/util/Messages.properties.el
index d033484bd..ec8c389c4 100644
--- a/org/w3c/css/util/Messages.properties.el
+++ b/org/w3c/css/util/Messages.properties.el
@@ -54,7 +54,7 @@ validate_by_input: Έλεγχος εγκυρότητας με άμεση εισ
 enter_CSS: Εισάγετε το CSS που θέλετε να ελέγξετε την εγκυρότητα
 submit_input: Εισάγετε αρχείο για έλεγχο εγκυρότητας
 note: Σημείωση
-note_xhtml_valid: Εάν επιθυμείτε να ελέγξετε την εγκυρότητα ενός CSS style sheet που είναι ενσωματωμένο σε ένα αρχείο (X)HTML, πρέπει αρχικά να ελέγξετε ότι είναι έγκυρο το αρχείο (X)HTML που χρησιμοποιείτε
+note_xhtml_valid: Εάν επιθυμείτε να ελέγξετε την εγκυρότητα ενός CSS style sheet που είναι ενσωματωμένο σε ένα αρχείο (X)HTML, πρέπει αρχικά να ελέγξετε ότι είναι έγκυρο το αρχείο (X)HTML που χρησιμοποιείτε
 # End of variables added along with Index page template
 
 W3C_validator_results: Αποτελέσματα Ελέγχου Εγκυρότητας W3C CSS για
@@ -88,7 +88,7 @@ no_errors_create_link_msg: Εάν επιθυμείτε να δημιουργήσ
 σε άλλους να ελέγχουν την εγκυρότητα της σελίδας, το URI είναι:
 no_errors_forHTML_only_msg: μόνο για αρχεία HTML/XML
 no_errors_bookmark_msg: Ή μπορείτε να προσθέσετε την τρέχουσα σελίδα στα αγαπημένα σας ή στη hotlist.
-note_valide_html: Για να λειτουργεί όπως προτείνεται, το CSS style sheet χρειάζεται ένα σωστό δέντρο συντακτικής ανάλυσης. Αυτό σημαίνει ότι πρέπει να χρησιμοποιείτε ένα έγκυρο HTML.
+note_valide_html: Για να λειτουργεί όπως προτείνεται, το CSS style sheet χρειάζεται ένα σωστό δέντρο συντακτικής ανάλυσης. Αυτό σημαίνει ότι πρέπει να χρησιμοποιείτε ένα έγκυρο HTML.
 top: Πάνω
 # hook_html_validator 
 not-css1-style: /* ΠΡΟΣΟΧΗ ! Δεν πρόκεται για ιδιότητα CSS1 ! */
diff --git a/org/w3c/css/util/Messages.properties.en b/org/w3c/css/util/Messages.properties.en
index fcda391ae..b1fe33b3b 100644
--- a/org/w3c/css/util/Messages.properties.en
+++ b/org/w3c/css/util/Messages.properties.en
@@ -59,7 +59,7 @@ validate_by_input: Validate by direct input
 enter_CSS: Enter the CSS you would like validated
 submit_input: Submit your input for validation
 note: Note
-note_xhtml_valid: If you want to validate your CSS style sheet embedded in an (X)HTML document, you should first check that the (X)HTML you use is valid
+note_xhtml_valid: If you want to validate your CSS style sheet embedded in an (X)HTML document, you should first check that the (X)HTML you use is valid
 vendorext: Vendor Extensions
 vext_default: Default
 vext_warnings: Warnings
@@ -98,7 +98,7 @@ result) to make it easier to re-validate this page in the future or to allow \
 others to validate your page, the URI is:
 no_errors_forHTML_only_msg: for HTML/XML document only
 no_errors_bookmark_msg: Or, you can just add the current page to your bookmarks or hotlist.
-note_valide_html: To work as intended, your CSS style sheet needs a correct document parse tree. This means you should use valid HTML.
+note_valide_html: To work as intended, your CSS style sheet needs a correct document parse tree. This means you should use valid HTML.
 top: Top
 # hook_html_validator 
 not-css1-style: /* BE CAREFUL ! This is not a CSS1 property ! */
@@ -309,9 +309,9 @@ warning.noexistence: Property \u201C%s\u201D doesn't exist in \u201C%s\u201D but
 warning.noexistence-media: Property \u201C%s\u201D doesn't exist for media \u201C%s\u201D
 warning.notforusermedium : Property \u201C%s\u201D doesn't exist for this usermedium
 warning.noothermedium : Properties for other media might not work for usermedium
-warning.vendor-extension : \u201C%s\u201D is an unknown vendor extension
-warning.vendor-ext-pseudo-class : \u201C%s\u201D is an unknown vendor extended pseudo-class
-warning.vendor-ext-pseudo-element : \u201C%s\u201D is an unknown vendor extended pseudo-element
+warning.vendor-extension : \u201C%s\u201D is a vendor extension
+warning.vendor-ext-pseudo-class : \u201C%s\u201D is a vendor extended pseudo-class
+warning.vendor-ext-pseudo-element : \u201C%s\u201D is a vendor extended pseudo-element
 warning.css-variable: Due to their dynamic nature, CSS variables are currently not statically checked
 
 warning.css-hack : \u201C%s\u201D is a CSS hack
@@ -454,7 +454,7 @@ error.typevaluemismatch: The value \u201C%s\u201D is incompatible with its type
 
 error.emptymedia: In CSS2, the media type in @media is mandatory
 
-error.email: email addresses cannot be validated by this tool, you might be scammed
+error.email: This tool cannot be used with email addresses. Please enter a valid URL and try again.
 
 error.nomodifierrangemedia: No prefixes are allowed for range media features
 error.comparator: The \u201C%s\u201D and \u201C%s\u201D comparators are not compatible in a media feature of type \u201Crange\u201D
diff --git a/org/w3c/css/util/Messages.properties.es b/org/w3c/css/util/Messages.properties.es
index b9184eb87..eee9778b8 100644
--- a/org/w3c/css/util/Messages.properties.es
+++ b/org/w3c/css/util/Messages.properties.es
@@ -58,7 +58,7 @@ validate_by_input: Validar mediante entrada directa
 enter_CSS: Introduce el código CSS que desees validar
 submit_input: Enviar archivo para su validación
 note: Nota
-note_xhtml_valid: Si deseas validar tu hoja de estilo CSS incrustada en un documento (X)HTML, deberías antes comprobar que el  (X)HTML utilizado es válido
+note_xhtml_valid: Si deseas validar tu hoja de estilo CSS incrustada en un documento (X)HTML, deberías antes comprobar que el  (X)HTML utilizado es válido
 # End of variables added along with Index page template
 
 W3C_validator_results: Resultados del Validador CSS del W3C para 
@@ -92,7 +92,7 @@ de la validación) para hacer que sea más fácil revalidar la página en el fut
 o para permitir que otras personas validen su página, el URI es:
 no_errors_forHTML_only_msg: para documentos HTML/XML únicamente
 no_errors_bookmark_msg: O, simplemente, puede añadir la página actual a su lista de marcadores o favoritos.
-note_valide_html: Para funcionar como previsto, tu hoja de estilo CSS necesita un "arbol sintactico". Esto significa que usted necesita usar  un valido codigo HTML.
+note_valide_html: Para funcionar como previsto, tu hoja de estilo CSS necesita un "arbol sintactico". Esto significa que usted necesita usar  un valido codigo HTML.
 top: Top
 # hook_html_validator 
 not-css1-style: /* ¡ TENGA CUIDADO ! ¡ Esta propiedad no está incluida en CSS1 ! */
@@ -268,6 +268,7 @@ warning.zero: Únicamente 0 puede ser un \u201C%s\u201D. Debe especificarse una
 error.noexistence-at-all: La propiedad \u201C%s\u201D no existe
 error.noexistence-media: La propiedad \u201C%s\u201D no existe en el medio \u201C%s\u201D
 error.noexistence: La propiedad \u201C%s\u201D no existe en \u201C%s\u201D pero existe en \u201C%s\u201D
+error.noexistence-typo: La propiedad \u201C%s\u201D no existe. El nombre más parecido, de una propiedad válida, es \u201C%s\u201D
 warning.noexistence: La propiedad \u201C%s\u201D no existe en \u201C%s\u201D pero existe en \u201C%s\u201D
 warning.noexistence-media: La propiedad \u201C%s\u201D no existe en el medio \u201C%s\u201D
 warning.notforusermedium : La propiedad \u201C%s\u201D no existe en este medio de usuario
@@ -377,4 +378,4 @@ error.divisortype: El divisor debe ser un número
 error.email: Las direcciones de e-mail no pueden ser validadas por esta herramienta, podrías ser víctima de un engaño
 error.conflicting-charset: Conflicto en la definición del juego de caracteres entre la red, @charset \u201C%s\u201D y el juego de caracteres \u201C%s\u201D
 error.bg_order: En la definición de fondo de CSS3, \u201Cbg_position\u201D debe aparecer antes que \u201Cbg_size\u201D si ambas están presentes
-error.divzero: División entre cero
\ No newline at end of file
+error.divzero: División entre cero
diff --git a/org/w3c/css/util/Messages.properties.fa b/org/w3c/css/util/Messages.properties.fa
index ed7c5bae8..01d9af3fe 100644
--- a/org/w3c/css/util/Messages.properties.fa
+++ b/org/w3c/css/util/Messages.properties.fa
@@ -53,7 +53,7 @@ validate_by_input: تایید اعتبار با ورودی مستقیم
 enter_CSS: ای را که می خواهید تایید اعتبار شود را وارد نمایید CSS
 submit_input: ورودیتان را برای اعتبار سنجی ارایه نمایید
 note: توجه
-note_xhtml_valid:  مورد استفاده معتبر باشد (X)HTML بررسی نمایید که  خودتان را تایید اعتبار نمایید، نخست باید (X)HTML جاسازی شده در یک سند CSS اگر بخواهید شیوه نامه ی 
+note_xhtml_valid:  مورد استفاده معتبر باشد (X)HTML بررسی نمایید که  خودتان را تایید اعتبار نمایید، نخست باید (X)HTML جاسازی شده در یک سند CSS اگر بخواهید شیوه نامه ی 
 # انتهای متغیرهای اضافه شده همراه با الگوی صفحه ی فهرست 
 
 W3C_validator_results: برای W3C CSS نتایج اعتبار سنج
@@ -81,7 +81,7 @@ no_errors_dl_local_msg: اگر می خواهید، می توانید یک کپی
 no_errors_create_link_msg: اگر شما می خواهید لینکی به این صفحه ایجاد نمایید (یعنی، نتایج \ این اعتبار سنجی) اجازه می دهد جهت اجازه یا تایید اعتبار مجدد این صفحه در آینده آسانتر ساخته شود هست URI ،دیگران که صفحه ی شما را تایید اعتبار می نمایند:
 no_errors_forHTML_only_msg: HTML/XML تنها برای سند
 no_errors_bookmark_msg: .یا، شما فقط می توانید صفحه ی فعلی را به بوکمارک ها یا هات لیست خود اضافه نمایید
-note_valide_html: .شما نیازمند یک نمودار درختی تجزیه سند صحیح است CSS جهت فعالیت بصورت مورد نظر، شیوه نامه .را بکار برید valid HTML این بدین منظور است که باید
+note_valide_html: .شما نیازمند یک نمودار درختی تجزیه سند صحیح است CSS جهت فعالیت بصورت مورد نظر، شیوه نامه .را بکار برید valid HTML این بدین منظور است که باید
 top: بالا
 # hook_html_validator: 
 not-css1-style: /* نیست CSS1 مواظب باشید! این یک مشخصه ی */
diff --git a/org/w3c/css/util/Messages.properties.fr b/org/w3c/css/util/Messages.properties.fr
index 29b6aee62..b6767d51e 100644
--- a/org/w3c/css/util/Messages.properties.fr
+++ b/org/w3c/css/util/Messages.properties.fr
@@ -58,8 +58,8 @@ validate_by_input: Validation par Saisie Directe
 enter_CSS: Saisissez la feuille de style à valider  (ATTENTION : feuilles de style CSS uniquement)
 submit_input: Valider la feuille de style
 note: Remarque
-note_xhtml_valid: Si vous souhaitez valider une feuille de style incorporée dans un document (X)HTML, vous devriez d'abord vérifier la validité de votre document (X)HTML
-note_valide_html: Les resultats de la validation de feuilles de styles incorporées dans un document (X)HTML ne sont fiables que si le document HTML est valide.
+note_xhtml_valid: Si vous souhaitez valider une feuille de style incorporée dans un document (X)HTML, vous devriez d'abord vérifier la validité de votre document (X)HTML
+note_valide_html: Les resultats de la validation de feuilles de styles incorporées dans un document (X)HTML ne sont fiables que si le document HTML est valide.
 # End of variables added along with Index page template
 vendorext: Extensions Propriétaires
 vext_default: Défaut
@@ -412,16 +412,16 @@ warning.notversion: \u201C%s\u201D ne peut être utilisé dans cette version de
 
 warning.noothermedium : Certaines propriétés relatives à d'autres media peuvent ne pas s'appliquer à ce medium
 warning.notforusermedium : La propriété \u201C%s\u201D n'existe pas pour ce medium d'utilisateur
-warning.vendor-extension : La propriété \u201C%s\u201D est une extension propriétaire inconnue
-warning.vendor-ext-pseudo-class : La pseudo-classe \u201C%s\u201D est une extension propriétaire inconnue
-warning.vendor-ext-pseudo-element : Le pseudo-élément \u201C%s\u201D est une extension propriétaire inconnue
+warning.vendor-extension : La propriété \u201C%s\u201D est une extension propriétaire
+warning.vendor-ext-pseudo-class : La pseudo-classe \u201C%s\u201D est une extension propriétaire
+warning.vendor-ext-pseudo-element : Le pseudo-élément \u201C%s\u201D est une extension propriétaire
 error.noatruleyet : Excepté @import, les règles @ ne sont pas supportés en CSS1 : \u201C%s\u201D
 error.notformobile : \u201C%s\u201D ne peut pas être utilisé pour le profile mobile
 error.notforatsc: \u201C%s\u201D ne peut pas être utilisé pour le profil ATSC
 error.notfortv: \u201C%s\u201D ne peut pas être utilisé pour le profil TV
 error.notversion: \u201C%s\u201D ne peut pas être utilisé pour cette version CSS: \u201C%s\u201D
 
-warning.css-variable: En raison de laur nature dynamique, les variables CSS ne sont pas vérifiées statiquement
+warning.css-variable: En raison de leur nature dynamique, les variables CSS ne sont pas vérifiées statiquement
 
 warning.css-hack : \u201C%s\u201D est un hack CSS
 
@@ -478,4 +478,4 @@ error.typevaluemismatch: La valeur \u201C%s\u201D est incompatible avec sa défi
 
 error.emptymedia: En CSS2, l'indication du type de media dans la règle @media est ogligatoire
 
-error.email: Les adresses email ne peuvent être validées par cet outil, il est possible que vous soyez victime d'une escroquerie
+error.email: Les adresses email ne peuvent être validées par cet outil, utlisez une URL en http ou https
diff --git a/org/w3c/css/util/Messages.properties.hi b/org/w3c/css/util/Messages.properties.hi
index f8ecf29d5..18b8283b9 100644
--- a/org/w3c/css/util/Messages.properties.hi
+++ b/org/w3c/css/util/Messages.properties.hi
@@ -54,7 +54,7 @@ validate_by_input: प्रत्यक्ष निवेश के द्व
 enter_CSS: मान्यकर्ण करने के लिए सीएसएस दर्ज करें
 submit_input: मान्यकर्ण करने के लिए आपनी सामग्री भेजें
 note: टिप्पणी
-note_xhtml_valid: यदि आप अपने (X) HTML दस्तावेज़ में एम्बेड होई सीएसएस शैली शीट का मान्यकर्ण करना चाहते हैं, तो पहले आप जाँच करें कि जिस (X) HTML दस्तावेज़ का आप का उपयोग कर रहें हैं वो मान्यकृत है।
+note_xhtml_valid: यदि आप अपने (X) HTML दस्तावेज़ में एम्बेड होई सीएसएस शैली शीट का मान्यकर्ण करना चाहते हैं, तो पहले आप जाँच करें कि जिस (X) HTML दस्तावेज़ का आप का उपयोग कर रहें हैं वो मान्यकृत है।
 # End of variables added along with Index page template
 
 W3C_validator_results: W3C सीएसएस मान्यकर्ण के परिणाम
@@ -85,7 +85,7 @@ no_errors_create_link_msg: यदि आप इस पृष्ठ (यानी
 आसान बनाने के लिए फिर से भविष्य में इस पृष्ठ को मान्य करने के लिए या दूसरों को अपने पृष्ठ को मान्य करने की अनुमति चाहते हैं, यूआरआइ है:
 no_errors_forHTML_only_msg: केवल HTML / XML दस्तावेज़ के लिए ही
 no_errors_bookmark_msg: या, आप अपने बुकमार्क्स या होत्लिस्ट में वर्तमान पृष्ठ में जोड़ सकते हैं.
-note_valide_html: इरादे के मुताबिक काम करने के लिए, आपकी सीएसएस शैली पत्रक को एक सही दस्तावेज़ पार्स पेड़ की जरूरत है. इसका मतलब है आप को वैध HTMLका उपयोग करना चाहिए.
+note_valide_html: इरादे के मुताबिक काम करने के लिए, आपकी सीएसएस शैली पत्रक को एक सही दस्तावेज़ पार्स पेड़ की जरूरत है. इसका मतलब है आप को वैध HTMLका उपयोग करना चाहिए.
 top: टॉप
 # hook_html_validator 
 not-css1-style: /* सावधान ! यह एक CSS1 संपत्ति नहीं है! */
diff --git a/org/w3c/css/util/Messages.properties.hu b/org/w3c/css/util/Messages.properties.hu
index 61d5e2141..518761fb9 100644
--- a/org/w3c/css/util/Messages.properties.hu
+++ b/org/w3c/css/util/Messages.properties.hu
@@ -56,7 +56,7 @@ validate_by_input: Érvényesítés közvetlen bevitellel
 enter_CSS: Írja be a CSS-t, melyet érvényesíttetni szeretne
 submit_input: Bevitel érvényesítésre küldése
 note: Megjegyzés
-note_xhtml_valid: Ha CSS stíluslapját (X)HTML dokumentumba ágyazva szeretné érvényesíttetni, először ellenőrizze, hogy a használt (X)HTML érvényes-e
+note_xhtml_valid: Ha CSS stíluslapját (X)HTML dokumentumba ágyazva szeretné érvényesíttetni, először ellenőrizze, hogy a használt (X)HTML érvényes-e
 
 # End of variables added along with Index page template
 
@@ -95,7 +95,7 @@ mások érvényesíthessék oldalát, az URI a következő:
 no_errors_forHTML_only_msg: csak HTML/XML documenumhoz
 no_errors_bookmark_msg: De hozzá is adhatja ezt az oldalt a könyvjelzők vagy kedvencek közé.
 
-note_valide_html: Hogy az elvárásoknak megfelelően működjön, a CSS stíluslaphoz helyes dokumentum fa-struktúra szükséges. Ez azt jelenti, hogy érvényes HTML-t kell használnia.
+note_valide_html: Hogy az elvárásoknak megfelelően működjön, a CSS stíluslaphoz helyes dokumentum fa-struktúra szükséges. Ez azt jelenti, hogy érvényes HTML-t kell használnia.
 
 top: Tetejére
 # hook_html_validator 
diff --git a/org/w3c/css/util/Messages.properties.it b/org/w3c/css/util/Messages.properties.it
index 8c5cee13c..ad0f8fc58 100644
--- a/org/w3c/css/util/Messages.properties.it
+++ b/org/w3c/css/util/Messages.properties.it
@@ -57,7 +57,7 @@ validate_by_input: Validazione tramite immissione diretta
 enter_CSS: Inserisci il testo del CSS che desideri validare
 submit_input: Invia il codice per la verifica
 note: Nota
-note_xhtml_valid: Se desideri verificare un foglio di stile CSS interno ad un documento (X)HTML, dovresti prima verificare la validità del codice (X)HTML
+note_xhtml_valid: Se desideri verificare un foglio di stile CSS interno ad un documento (X)HTML, dovresti prima verificare la validità del codice (X)HTML
 # End of variables added along with Index page template
 
 W3C_validator_results: Risultati della validazione W3C dei Fogli di Stile a Cascata (CSS) per 
@@ -92,7 +92,7 @@ per rendere più facile una futura riverifica di questa pagina o per consentire
 di verificare la conformità della tua pagina, l'URI è:
 no_errors_forHTML_only_msg: solo per documenti HTML/XML
 no_errors_bookmark_msg: Oppure puoi solamente aggiungere la pagina corrente ai tuoi collegamenti preferiti.
-note_valide_html: To work as intended, your CSS style sheet needs a correct document parse tree. This means you should use valid HTML.
+note_valide_html: To work as intended, your CSS style sheet needs a correct document parse tree. This means you should use valid HTML.
 top: Top
 # hook_html_validator 
 not-css1-style: /* BE CAREFUL ! This is not a CSS1 property ! */
diff --git a/org/w3c/css/util/Messages.properties.ja b/org/w3c/css/util/Messages.properties.ja
index 03c470e10..c9cac4f22 100644
--- a/org/w3c/css/util/Messages.properties.ja
+++ b/org/w3c/css/util/Messages.properties.ja
@@ -57,7 +57,7 @@ validate_by_input: テキストエリアに直接入力して検証
 enter_CSS: 検証したいCSSをテキストエリアに入力してください (CSSソースのみ)
 submit_input: 入力したテキストを検証するために送信します
 note: メモ
-note_xhtml_valid: CSSスタイルシートを意図した通りに機能させるには、正しい文書解析木が必要です。つまり、正当なHTMLを用いるべきです。
+note_xhtml_valid: CSSスタイルシートを意図した通りに機能させるには、正しい文書解析木が必要です。つまり、正当なHTMLを用いるべきです。
 # End of variables added along with Index page template
 
 W3C_validator_results: CSS 検証サービス検証結果
@@ -93,7 +93,7 @@ no_errors_create_link_msg: この検証結果のページに対するリンク
 他の人がこのページを検証する事が容易になります。
 no_errors_forHTML_only_msg: HTML/XML 文書のみに有効
 no_errors_bookmark_msg: もちろん、このページをブックマークやホットリストに追加したのでもよいでしょう。
-note_valide_html: あなたの CSSスタイルシートを意図した通りに機能させるには、正しい文書解析木が必要です。つまり、正しいHTMLを用いるべきです。
+note_valide_html: あなたの CSSスタイルシートを意図した通りに機能させるには、正しい文書解析木が必要です。つまり、正しいHTMLを用いるべきです。
 top: Top
 # hook_html_validator 
 not-css1-style: /* 注意して下さい ! このプロパティはCSS1用ではありません ! */
diff --git a/org/w3c/css/util/Messages.properties.ko b/org/w3c/css/util/Messages.properties.ko
index 2c48b1f8a..2738afef7 100644
--- a/org/w3c/css/util/Messages.properties.ko
+++ b/org/w3c/css/util/Messages.properties.ko
@@ -57,7 +57,7 @@ validate_by_input: 직접 입력을 통한 검사
 enter_CSS: 검사할 CSS를 입력하여 주십시오
 submit_input: 검사할 내용을 저장
 note: 주의
-note_xhtml_valid: (X)HTML 문서에 포함된 CSS 스타일시트를 검사하기 이전에, (X)HTML 문법 검사를 하는 것을 권장합니다.
+note_xhtml_valid: (X)HTML 문서에 포함된 CSS 스타일시트를 검사하기 이전에, (X)HTML 문법 검사를 하는 것을 권장합니다.
 # End of variables added along with Index page template
 
 W3C_validator_results: W3C CSS 검사 결과
@@ -85,7 +85,7 @@ no_errors_dl_local_msg: 원하신다면, 이 이미지의 사본을 웹 사이
 no_errors_create_link_msg: 향후 이 페이지를 쉽게 검사하거나 다른 사용자들이 검사를 해볼 수 있게 이 검사 결과에 대한 링크를 만들고 싶다면, 링크 URI는 다음과 같습니다:
 no_errors_forHTML_only_msg: HTML/XML 문서 전용
 no_errors_bookmark_msg: 또는, 이 페이지를 즐겨찾기 (또는 책갈피) 에 추가하여도 됩니다.
-note_valide_html: 정상적인 작동을 위해서, 스타일시트는 올바른 문서 구조를 가지고 있어야 합니다. 즉, 올바른 HTML을 사용하여야 합니다.
+note_valide_html: 정상적인 작동을 위해서, 스타일시트는 올바른 문서 구조를 가지고 있어야 합니다. 즉, 올바른 HTML을 사용하여야 합니다.
 top: 최상위
 # hook_html_validator 
 not-css1-style: /* 주의하세요 ! 이것은 CSS1 속성이 아닙니다 !  */
diff --git a/org/w3c/css/util/Messages.properties.nl b/org/w3c/css/util/Messages.properties.nl
index e22b6cd77..bc969a316 100644
--- a/org/w3c/css/util/Messages.properties.nl
+++ b/org/w3c/css/util/Messages.properties.nl
@@ -57,7 +57,7 @@ validate_by_input: Valideer via directe invoer
 enter_CSS: Voer de CSS in die je wilt valideren
 submit_input: Verzenden om te valideren
 note: Opmerking
-note_xhtml_valid: Als je een CSS style sheet wilt valideren die gebruikt wordt in een (X)HTML document, zou je die eerst moeten laten controleren
+note_xhtml_valid: Als je een CSS style sheet wilt valideren die gebruikt wordt in een (X)HTML document, zou je die eerst moeten laten controleren
 # End of variables added along with Index page template
 
 W3C_validator_results: W3C CSS Validator Resultaten met object : 
@@ -91,7 +91,7 @@ om het gemakkelijker te maken deze pagina later te revalideren of anderen \
 in staat te stellen uw pagina te valideren is de URL:
 no_errors_forHTML_only_msg: Alleen voor HTML documenten
 no_errors_bookmark_msg: Of u kunt de huidige pagina toevoegen aan uw favorieten of hotlist.
-note_valide_html: Als je een CSS style sheet wilt valideren die gebruikt wordt in een (X)HTML document, zou je die eerst moeten laten controleren.
+note_valide_html: Als je een CSS style sheet wilt valideren die gebruikt wordt in een (X)HTML document, zou je die eerst moeten laten controleren.
 top: Top
 # hook_html_validator 
 not-css1-style: /* VOORZICHTIG ! Dit is geen CSS1 eigenschap ! */
diff --git a/org/w3c/css/util/Messages.properties.pl-PL b/org/w3c/css/util/Messages.properties.pl-PL
index 5323b3548..948a1d651 100644
--- a/org/w3c/css/util/Messages.properties.pl-PL
+++ b/org/w3c/css/util/Messages.properties.pl-PL
@@ -1,4 +1,7 @@
 # Polish translation, last updated in sync with Messages.properties.en,v 1.31
+# parameters use %s when ordered sequencially
+# you can use specific ordering by adding a digit after it
+# like "foo %s2 bar %s1 toto %s3 titi" parameters 1,2,3 will be at %s1, %s2 and %s3
 
 direction: ltr
 language_name: Polski
@@ -10,43 +13,40 @@ most_important: Najważniejsze
 no_warnings: Brak ostrzeżeń
 profile: Profil
 no_special_profile: Brak specjalnego profilu
-css1: CSS wersja 1
-css2: CSS wersja 2
-css21: CSS wersja 2.1
-css3: CSS wersja 3
-css3svg: CSS wersja 3 + SVG
+css1: CSS poziom 1
+css2: CSS poziom 2
+css21: CSS poziom 2.1
+css3: CSS poziom 3
+css3svg: CSS poziom 3 + SVG
 svg: SVG
 svgbasic: SVG Basic
 svgtiny: SVG tiny
 mobile: mobilny
-ATSC_TV_profile: ATSC TV profil
-TV_profile: TV profil
+ATSC_TV_profile: Profil ATSC TV
+TV_profile: Profil TV
 medium: Medium
-aural: dźwiękowe
-braille: braille
-embossed: wytłaczane
-handheld: ręczne
-print: druk
-projection: projekcja
-screen: ekran
-tty: TTY
-tv: TV
-presentation: prezentacja
-
+aural: aural (syntezatory mowy, przestarzałe)
+braille: braille (urządzenia brajlowskie, przestrzałe)
+embossed: embossed (drukarki brajlowskie, przestarzałe)
+handheld: handheld (urządzenia przenośne, przestarzałe)
+print: print (dokumenty drukowane i podgląd wydruku)
+projection: projection (projektory, przestarzałe)
+screen: screen (ekrany komputerowe, tablety, smartfony...)
+tty: tty (urządzenia teletekstowe, przestarzałe)
+tv: tv (urządzenia telewizyjne, przestarzałe)
+presentation: presentation (przestarzałe)
 type: Typ
 no_special_type: Automatycznie
 html_doc: HTML
 css_doc: CSS
-
 check: Sprawdź
 W3C_CSS_validation_service: Usługa Walidacji CSS W3C
-CSS_validation_service: Usługa Walidacji CSS W3C
-check_CSS: Sprawdź Kaskadowe Arkusze Stylów CSS) i dokumenty (X)HTML z arkuszami stylów
+check_CSS: Sprawdź Kaskadowe Arkusze Stylów (CSS) i dokumenty (X)HTML z arkuszami stylów
 by_URI: przez URI
 by_file_upload: poprzez załadowanie pliku
 by_direct_input: poprzez wprowadzenie kodu
 validate_by_URI: Walidacja przez URI
-enter_uri: Wprowadź URI dokumentu (HTML z CSS lub tylko CSS) do walidacji  
+enter_uri: Wprowadź URI dokumentu (HTML z CSS lub tylko CSS) do walidacji
 page_address: Adres strony, która ma być walidowana
 address: Adres
 submit_uri: Prześlij plik do walidacji
@@ -60,27 +60,33 @@ enter_CSS: Wprowadź kod CSS do walidacji
 submit_input: Prześlij plik do walidacji
 note: Uwaga
 note_xhtml_valid: Jeśli chcesz walidować arkusz CSS umieszczony w dokumencie (X)HTML, powinieneś wpierw sprawdzić, czy użyty (X)HTML jest poprawny
+vendorext: Rozszerzenie Dostawców
+vext_default: Domyślne
+vext_warnings: Ostrzeżenia
+vext_errors: Błędy
+
 # End of variables added along with Index page template
 
 W3C_validator_results: Wyniki Walidatora CSS W3C dla
 # file_title: 
+CSS_validation_service: Usługa Walidacji CSS W3C
 jump_to: Zobacz
 # errors_count: 
 errors: Błędy
 # warnings_count 
 warnings: Ostrzeżenia
-validated_CSS: Swój arkusz stylu
+validated_CSS: Sprawdzony arkusz stylów
 congrats: Gratulacje! Nie znaleziono żadnych błędów.
 # The sentence defined by doc_validates_before_link and doc_validates_after_link variables goes: \
 # "This document validates as CSSXX!" where XX stands for the CSS version used \
 # Since the content of the link about the CSS version is generated on the fly, \
 # it is important to define what goes before the link and what goes afterwards in 2 separate \
 # variables because the position of the link in the sentence varies in different languages
-doc_validates_before_link: Dokument ten jest poprawnie napisanym arkuszem  
+doc_validates_before_link: Dokument ten jest poprawnie napisanym arkuszem
 doc_validates_after_link: !
-no_errors_interoperable_msg: Aby pokazać czytelnikom swojej strony, że stworzyłeś stronę interoperacyjną \
-, możesz umieścić ikonę na każdej stronie, która pomyślnie przeszła walidację. Oto kod HTML\
-, który możesz dodać do swojej strony:
+no_errors_interoperable_msg: Aby pokazać czytelnikom swojej strony, że stworzyłeś stronę interoperacyjną, \
+możesz umieścić ikonę na każdej stronie, która pomyślnie przeszła walidację. Oto kod XHTML, \
+który możesz dodać do swojej strony:
 valid_CSS: Poprawny CSS!
 # 
 no_errors_close_tags_msg: zakończ znacznik obrazu z > zamiast /> jeśli używasz HTML <= 4.01
@@ -91,8 +97,8 @@ no_errors_create_link_msg: Jeśli chciałbyś stworzyć link do tej strony (np.
 walidacji) aby ułatwić sobie ponowną walidację w przyszłości lub w celu pozwolenia \
 innym na walidację tej strony, użyj następującego adresu:
 no_errors_forHTML_only_msg: jedynie dla dokumentów HTML/XML
-no_errors_bookmark_msg: Lub możesz dodać stronę do Ulubionych.
-note_valide_html: Aby działał poprawnie, Twój arkusz CSS wymaga poprawnego drzewa dokumentu. To znaczy, że powinieneś upewnić się, że używasz poprawnego HTMLa.
+no_errors_bookmark_msg: Lub możesz dodać stronę do zakładek.
+note_valide_html: Aby działał poprawnie, arkusz stylów CSS potrzebuje poprawnego drzewa parsowania dokumentu. To znaczy, że powinieneś upewnić się, że używasz poprawnego HTMLa.
 top: Szczyt
 # hook_html_validator 
 not-css1-style: /* OSTROŻNIE ! To nie jest właściwość pochodząca z CSS1 ! */ 
@@ -117,9 +123,9 @@ dl_title: Ściągnij i zainstaluj walidator CSS
 feedback_title: Jak wysłać opinię na temat tej usługi
 credits_title: Podziękowania
 W3C_quality_msg: W3C's Quality Assurance Activity dostarcza darmowych narzędzi webowych i wiele więcej
-learn_more_msg: Dowiedz się więcej o Kaskadowych Arkuszach Styli
+learn_more_msg: Dowiedz się więcej o Kaskadowych Arkuszach Stylów
 support: Wesprzyj to narzędzie, zostań
-supporter: Osoba wspierająca W3C
+supporter: Osobą wspierająca W3C
 # End of variables added along with Velocity
 
 # Definiuje komunikaty błędów i ostrzeżeń
@@ -127,280 +133,327 @@ content-type: text/html; charset=utf-8
 content-language: pl
 output-encoding-name: utf-8
 
-# Można zmienić poziom ostrzeżeń w następujšcy sposób (przykład) :
+error.conflicting-charset: Konflikt definicji zestawu znaków między siecią a @charset \201E%s\u201D oraz \201E%s\u201D
+
+# Można zmienić poziom ostrzeżeń w następujący sposób (przykład):
 # warning.redefinition.level: 5
-#  poziom jest liczbš pomiędzy 0 i 9 (wszystkie inne wartoœci sš ignorowane)
-warning.redefinition: Redefiniowanie \u201C%s\u201D
-
-# used by xml parser
-warning.style-inside-comment: Do not put style rules inside HTML comments as they may be removed by user agent
-
-# użyte przez org.w3c.css.properties.Css1Style
-warning.same-colors: Takie same kolory dla \u201C%s\u201D i \u201C%s\u201D
-warning.no-color: Brak koloru w background-color
-warning.no-background-color: Brak background-color with your color
-#warning.color.mixed-capitalization is now obsolete
-#warning.color.mixed-capitalization: Chociaż nazwy kolorów nie sš wrażliwe na wielkoœć czcionki, zaleca się aby używać kombinacji małej i dużej czcionki, co uczyni nazwy bardziej czytelnymi: \u201C%s\u201D
-warning.no-generic-family: \u201C%s\u201D: Zaleca się aby rodziny czcionek rodzajowych były stosowane w ostatecznoœci
-warning.with-space: nazwy rodzin czcionek zawierajšce białe znaki powinny być w cudzysłowiu. Jeœli pominie się cudzysłów, białe znaki \
-przed i po nazwie sš ignorowane oraz cišg białych znaków wewnštrz nazwy \
-jest przekształcony w jednš spację. 
+#  poziom jest liczbą całkowitą pomiędzy 0 i 9 (wszystkie inne wartości są ignorowane)
+warning.redefinition: Redefiniowanie \u201E%s\u201D
+
+# używane przez xml parser
+warning.style-inside-comment: Nie umieszczaj reguł stylu w komentarzach HTML, ponieważ user agent może je usunąć
+
+
+# używane przez org.w3c.css.properties.Css1Style
+warning.same-colors: Takie same kolory dla \u201E%s\u201D i \u201E%s\u201D
+warning.no-color: Nie ustawiono koloru (lub kolor jest ustawiony na przezroczysty), ale ustawiono kolor tła. Upewnij się, że kaskadowanie kolorów utrzymuje tekst w miarę czytelny.
+warning.no-background-color: Nie ustawiono koloru tła (lub kolor tła jest ustawiony na przezroczysty), ale ustawiono kolor. Upewnij się, że kaskadowanie kolorów utrzymuje tekst w miarę czytelny.
+#warning.color.mixed-capitalization jest teraz przestarzały
+#warning.color.mixed-capitalization: Mimo że wielkość liter w nazwach kolorów nie ma znaczenia, zaleca się stosowanie kapitalizacji mieszanej, aby nazwy były bardziej czytelne: %s
+warning.no-generic-family: \u201E%s\u201D: Zaleca się aby rodziny czcionek rodzajowych były stosowane jako ostatnia alternatywa
+warning.with-space: nazwy rodzin czcionek zawierające białe znaki powinny być w cudzysłowie. Jeśli pominie się cudzysłów, białe znaki \
+przed i po nazwie są ignorowane oraz ciąg białych znaków wewnątrz nazwy \
+jest przekształcony w jedną spację. 
 warning.no-padding: Zaleca się aby mieć padding z kolorem tła
-warning.same-colors2: Takie same kolory dla color i background-color w dwóch miejscach \u201C%s\u201D i \u201C%s\u201D
-warning.relative-absolute: Istniejš długoœci absolutne i relatywne w \u201C%s\u201D. To nie jest mocny arkusz stylów.
+warning.same-colors2: Takie same kolory dla color i background-color w dwóch miejscach \u201E%s\u201D i \u201E%s\u201D
+warning.relative-absolute: Istnieją długości absolutne i relatywne w \u201E%s\u201D. To nie jest mocny arkusz stylów.
  by org.w3c.css.properties.CssSelectors
-warning.unknown-html: \u201C%s\u201D nie jest elementem HTML
-warning.html-inside: Element HTML nie może znajdować się wewnštrz innego elementu
-warning.body-inside: Element BODY nie może być wewnštrz innego elementu z wyjštkiem HTML
-warning.pseudo-classes: Anchor pseudo-class \u201C%s\u201D nie działa na inne elementy poza 'A'
+warning.unknown-html: \u201E%s\u201D nie jest elementem HTML
+warning.html-inside: Element HTML nie może znajdować się wewnątrz innego elementu
+warning.body-inside: Element BODY nie może być wewnątrz innego elementu z wyjątkiem HTML
+warning.pseudo-classes: Anchor pseudo-class \u201E%s\u201D nie działa na inne elementy poza \u201EA\u201D
 
-# nie użyte przez org.w3c.css.properties.CssSelectors na czas obecny
-warning.noinside: \u201C%s\u201D nie może być wewnštrz elementu inline 
-warning.withblock: Uwaga. Pseudo-elementy mogš być dołšczone jedynie do elementu block-level 
-warning.block-level: Właœciwoœć tš stosuje się jedynie do elementów block-level.
+# nie używane przez org.w3c.css.properties.CssSelectors na czas obecny
+warning.noinside: \u201E%s\u201D nie może być wewnątrz elementu inline 
+warning.withblock: Uwaga. Pseudo-elementy mogą być dołączone jedynie do elementu blokowych 
+warning.block-level: Właściwość tą stosuje się jedynie do elementów blokowych.
 
-# użyte przez org.w3c.css.parser.Frame
-warning.no-declaration: No declarations in the rule
+# używane przez org.w3c.css.parser.Frame
+warning.no-declaration: Brak deklaracji w regule
 
-# used by org.w3c.css.parser.CssFouffa AND NEEDS TRANSLATION
-warning.unsupported-import: Imported style sheets are not checked in direct input and file upload modes
+# used by org.w3c.css.parser.CssFouffa
+warning.unsupported-import: Zaimportowane arkusze stylów nie są sprawdzane w trybach bezpośredniego wprowadzania i przesyłania plików
 
-# użyte przez org.w3c.css.values.CssColor
-warning.out-of-range: \u201C%s\u201D is out of range
-error.invalid-color: Invalid RGB function
+# używane przez org.w3c.css.values.CssColor
+warning.out-of-range: \u201E%s\u201D jest poza zakresem
+error.invalid-color: Niepoprawna funkcja RGB
 
-warning.marker: Właœciwoœć marker-offset stosuje się do elementów z 'display: marker'
+# używane dla obcinania wartości ujemnych
+warning.negative: wartość ujemna \201E%s\u201D będzie interpretowana jako \201E0\u201D
+warning.lowerequal: wartość \u201E%s\u201D będzie interpretowana jako \u201E%s\u201D
+warning.greaterequal: wartość \201E%s\u201D będzie interpretowana jako \201E%s\u201D
+warning.noexproperty: Właściwość \201E%s\u201D nie istnieje
 
-# użyte przez org.w3c.css.properties.ACssStyle
-warning.relative: Zastosowanie jednostek relatywnych we właœciwoœci \u201C%s\u201D daje w rezultacie silniejszy arkusz stylów
+warning.marker: Właściwość marker-offset stosuje się do elementów z \u201Edisplay: marker\u201D
 
-# użyte przez org.w3c.css.css.StyleSheetParser i org.w3c.css.css.StyleSheetXMLParser
-error.at-rule: Niestety ale at-rule \u201C%s\u201D jest nie wdrożony.
-warning.at-rule: Niestety ale at-rule \u201C%s\u201D jest nie wdrożony.
+# używane przez org.w3c.css.properties.ACssStyle
+warning.relative: Zastosowanie jednostek relatywnych we właściwości \u201E%s\u201D daje w rezultacie silniejszy arkusz stylów
 
-# użyte przez wszystkie właœciwoœci i wartoœci
-error.operator: \u201C%s\u201D jest niepoprawnym operatorem
-error.negative-value: Wartoœci negatywne \u201C%s\u201D sš niedozwolone
-error.few-value: Zbyt mało wartoœci dla właœciwoœci \u201C%s\u201D
+# używane przez org.w3c.css.css.StyleSheetParser i org.w3c.css.css.StyleSheetXMLParser
+error.at-rule: Niestety ale at-rule \u201E%s\u201D jest nie wdrożony.
+warning.at-rule: Niestety ale at-rule \u201E%s\u201D jest nie wdrożony.
 
-# Uwaga! Wartoœci sš pierwsze
-# Można napisać coœ takiego : Dla color, blue nie jest wartoœciš poprawnš 
-error.value: \u201C%s\u201D nie jest wartoœciš \u201C%s\u201D 
+# używane przez wszystkie właściwości i wartości
+error.operator: \u201E%s\u201D jest niepoprawnym operatorem
+error.negative-value: Wartości negatywne \u201E%s\u201D są niedozwolone
+error.few-value: Zbyt mało wartości dla właściwości \u201E%s\u201D
+
+# Uwaga! Wartości są pierwsze
+# Można napisać coś takiego: Dla color, blue nie jest wartością poprawną 
+error.value: \u201E%s\u201D nie jest wartością \u201E%s\u201D 
+
+# used by org.w3c.css.properties.svg.CssPointerEvents
+warning.value-unofficial: \u201E%s\u201D nie jest zdefiniowana w żadnej specyfikacji jako dozwolona wartość dla \u201E%s\u201D, ale jest obsługiwana w wielu przeglądarkach
 
 #użyte przez org.w3c.css.properties3.CssToggleGroup
-error.groupname: \u201C%s\u201D nie jest poprawnš groupname. Zastosuj poprawny identyfikator
+error.groupname: \u201E%s\u201D nie jest poprawną groupname. Zastosuj poprawny identyfikator
 
 #użyte przez org.w3c.css.properties3.CssGroupReset
-error.nogroup: \u201C%s\u201D nie jest ustalona przez właœciwoœć toggle-group
+error.nogroup: \u201E%s\u201D nie jest ustalona przez właściwość toggle-group
 
 #użyte przez org.w3c.css.properties3.CssGlyphOrVert
-error.anglevalue: Wartoœć powinna być pomiędzy -360 i 360 oraz podzielna przez 90
+error.anglevalue: Wartość powinna być pomiędzy -360 i 360 oraz podzielna przez 90
 
 #użyte przez org.w3c.css.properties3.CssTextKashidaSpace
-error.percentage: Oczekuje się wartoœci procentowej
+error.percentage: Oczekuje się wartości procentowej
 
 #użyte przez org.w3c.css.properties.CssTextAlign
-warning.xsl: Wartoœć \u201C%s\u201D stosuje się jedynie w XSL
+warning.xsl: Wartość \u201E%s\u201D stosuje się jedynie w XSL
 
 #użyte przez org.w3c.css.parser.analyzer.CssParser
-warning.medialist : medialist powinna zaczšć się z 'media :' \u201C%s\u201D
-error.nocomb: Kombinator \u201C%s\u201D pomiędzy selektorami nie jest dozwolony w tym profilu lub wersji
+warning.medialist: medialist powinna zacząć się z \u201Emedia:\u201D \u201E%s\u201D
+error.nocomb: Kombinator \u201E%s\u201D pomiędzy selektorami nie jest dozwolony w tym profilu lub wersji
 
 #użyte przez org.w3c.css.properties.CssDirection
-warning.direction: Zamiast stosować 'direction' dla elemetów block-level, zastosuj nowš własnoœć CSS3 'writing-mode' 
+warning.direction: Zamiast stosować \u201Edirection\u201D dla elementów blokowych, zastosuj nową własność CSS3 \u201Ewriting-mode\u201D 
 
-# użyte przez org.w3c.css.properties.CssTextDecoration
-error.same-value: \u201C%s\u201D pojawia się dwukrotnie
+# używane przez org.w3c.css.properties.CssTextDecoration
+error.same-value: \u201E%s\u201D pojawia się dwukrotnie
 
-error.generic-family.quote: Nazwy rodzin rodzajowych sš słowami kluczowymi i nie mogš być cytowane.
+error.generic-family.quote: Nazwy rodzin rodzajowych są słowami kluczowymi i dlatego nie mogą być zapisywane w cudzysłowie.
 
-# użyte przez org.w3c.css.properties.CssClip
+# używane przez org.w3c.css.properties.CssClip
 error.shape: Niepoprawna definicja shape rect(,,,)
-error.shape-separator: Niepoprawny separator w definicji shape. Musi to być przecinek.
+error.shape-separator: Niepoprawny separator w definicji shape. Wymagany jest przecinek.
+warning.shape-separator: Niepoprawny separator w definicji shape. Wymagany jest przecinek.
 
-# użyte przez org.w3c.css.properties.CssContent
+# używane przez org.w3c.css.properties.CssContent
 error.attr: Niepoprawna definicja attr, attr(X)
-error.function: Niepoprawna definicja function  
+error.function: Niepoprawna definicja function
 error.counter: Niepoprawna definicja counter, counter([,]?)
 error.counters: Niepoprawna definicja counters, counters(,[,]?)
 
-# użyte przez org.w3c.css.font.Src
+# używane przez org.w3c.css.properties.css*.CssFont
+error.system-font-keyword-not-sole-value: Żadne inne wartości właściwości nie powinny być używane z \u201E%s\u201D. Powinna to być jedyna wartość; np. \u201Ep { font: %s; }\u201D
+
+# używane przez org.w3c.css.font.Src
 error.format: Niepoprawna definicja format, format([,]*)
 error.local: Niepoprawna definicja, local(|+)
 
-# użyte przez org.w3c.css.values.CssAngle, org.w3c.css.values.CssFrequency, org.w3c.css.values.CssTime, org.w3c.css.values.CssLength
-error.unit: \u201C%s\u201D nie jest poprawnš jednostkš
+# używane przez org.w3c.css.values.CssAngle, org.w3c.css.values.CssFrequency, org.w3c.css.values.CssTime, org.w3c.css.values.CssLength
+error.unit: \u201E%s\u201D nie jest poprawną jednostką
 
-# użyte przez org.w3c.css.aural.ACssAzimuth
+# używane przez org.w3c.css.aural.ACssAzimuth
 error.degree: Pozycja musi być wyrażona w stopniach.
 
-# użyte przez org.w3c.css.aural.ACssElevation
-error.elevation.range: Okreœla elewację jako kšt pomiędzy '-90deg' i '90deg'.
+# używane przez org.w3c.css.aural.ACssElevation
+error.elevation.range: Określa elewację jako kąt pomiędzy \u201E-90deg\u201D i \u201E90deg\u201D.
 
-# użyte przez org.w3c.css.aural.ACssPitchRange
-error.range: Wartoœć jest poza zasięgiem. Wartoœć powinna być pomiędzy '0' i '100'.
+# używane przez org.w3c.css.aural.ACssPitchRange
+error.range: Wartość jest poza zasięgiem. Wartość powinna być pomiędzy \u201E0\u201D i \u201E100\u201D.
 
-# użyte przez org.w3c.css.properties.CssTextShadow
-error.two-lengths: Shadow offset jest okreœlony dwoma wartoœciami . (Blur radius może być okreœlony po shadow offset.)
+# używane przez org.w3c.css.properties.CssTextShadow
+error.two-lengths: Shadow offset jest określony dwoma wartościami . (Blur radius może być określony po shadow offset.)
 
-error.integer: Liczba ta musi być liczbš całkowitš.
+error.integer: Liczba ta powinna być liczbą całkowitą.
 error.comma: Brak przecinka jako separatora.
 
-# użyte przez org.w3c.css.values.CssPercentage
-error.percent: \u201C%s\u201D jest niepoprawnš wartoœciš procentowš
-
-# użyte przez org.w3c.css.values.CssString
-error.string: \u201C%s\u201D jest niepoprawnym cišgiem
-
-# użyte przez org.w3c.css.values.CssURL
-error.url: \u201C%s\u201D jest niepoprawnym URL
-
-# użyte przez org.w3c.css.values.CssColor
-error.rgb: \u201C%s\u201D nie jest prawidłowym numerem koloru 3 lub 6 hexadecimals 
-error.angle: \u201C%s\u201D jest niepoprawnym kštem. Wartoœć powinna być pomiędzy 0 i 360
-
-# użyte przez org.w3c.css.values.CssNumber
-error.zero: Jedynie 0 może być \u201C%s\u201D. Musisz wstawić jednostkę po numerze
-warning.zero: Jedynie 0 może być \u201C%s\u201D. Musisz wstawić jednostkę po numerze
-
-# użyte przez org.w3c.css.parser.CssPropertyFactory 
-error.noexistence: WłaWłaściwość \u201C%s\u201D nie istnieje w \u201C%s\u201D, ale istnieje w \u201C%s\u201D
-warning.noexistence: Właściwość \u201C%s\u201D nie istnieje w \u201C%s\u201D, ale istnieje w \u201C%s\u201D
-error.noexistence-media: Właœciwoœć \u201C%s\u201D nie istnieje dla media \u201C%s\u201D
-error.noexistence-at-all: Właściwość \u201C%s\u201D nie istnieje
-warning.noexistence-media: Właœciwoœć \u201C%s\u201D nie istnieje dla media \u201C%s\u201D
-warning.notforusermedium : Właœciwoœć \u201C%s\u201D nie istnieje dla tego usermedium
-warning.noothermedium : Właœciwoœć dla innych mediów może nie działać dla usermedium
-# użyte przez org.w3c.css.parser.AtRule*
-error.noatruleyet : Inne @rules poza @import nie sš wspierane przez CSS1 \u201C%s\u201D
-# użyte przez org.w3c.css.parser.analyzer.CssParser
-error.notforcss1 : Wartoœć \u201C%s\u201D nie istnieje w CSS1
-warning.pseudo: Nieznany pesudo-element lub pseudo-klasa \u201C%s\u201D w domyślnym profilu (\u201C%s\u201D)
-warning.nocomb: Kombinator \u201C%s\u201D pomiędzy selektorami nie jest dozwolony w tym profilu (\u201C%s\u201D)
-warning.charsetspecial: Ten profil ma ściśle określoną składnię dla reguły @charset: @charset, dokładnie jedna spacja, nazwa kodowania w cudzysłowie, średnik.
-warning.notversion: \u201C%s\u201D nie może zostać użyty z tą wersją CSS: \u201C%s\u201D
-
-# użyte przez org.w3c.css.parser.CssFouffa
-error.unrecognize: Zbyt dużo wartoœci lub wartoœci nie rozpoznane
-
-# użyte przez org.w3c.css.parser.CssFouffa
-generator.unrecognize: Błšd parsowania
-generator.dontmixhtml: Błąd parsowania: Arkusz styli nie powinien zawierać składni HTML.
-
-# used by org.w3c.css.css.StyleSheetGeneratorHTML2
-error.unknown: Unknown error
-
-# użyte przez org.w3c.css.parser.CssSelectors
-error.pseudo-element: Pseudo-element \u201C%s\u201D nie może pojawić się w następujšcym kontekœcie \u201C%s\u201D
-error.pseudo-class: Pseudo-class .\u201C%s\u201D nie może pojawić się w następujšcym kontekœcie HTML \u201C%s\u201D
-error.pseudo: Niznany pseudo-element lub pseudo-class \u201C%s\u201D
-error.id: Selektor ID #\u201C%s\u201D jest niepoprawny ! Tylko jeden selektor ID może być okreœlony w selektorze prostym: \u201C%s\u201D.
-error.space: Jeœli stosuje się selektor atrybutu ~=, wyraz w wartoœci \u201C%s\u201D nie powinien zawierać spacji.
-error.todo : Niestety, ale funkcja \u201C%s\u201D nie została jeszcze wdrożona.
-error.incompatible: \u201C%s\u201D i \u201C%s\u201D sš niekompatybilne
-warning.incompatible: \u201C%s\u201D i \u201C%s\u201D sš niekompatybilne
-error.notformobile : \u201C%s\u201D nie może być zastosowany w profilu mobilnym
-error.notforatsc : \u201C%s\u201D nie może być zastosowany w profilu ATSC
-error.notfortv : \u201C%s\u201D nie może być zastosowany w profilu TV
-error.notversion : \u201C%s\u201D nie może być zastosowany w tej wersji CSS : \u201C%s\u201D
-
-error.media: nierozpoznane media \u201C%s\u201D 
-error.page: nierozpoznana pseudo named page \u201C%s\u201D
-
-error.unrecognized.link: Nierozpoznany link element lub xml-stylesheet PI.
-
-# użyte przez StyleSheetGeneratorHTML
+# używane przez org.w3c.css.values.CssPercentage
+error.percent: \u201E%s\u201D jest niepoprawną wartością procentową
+
+# używane przez org.w3c.css.values.CssString
+error.string: \u201E%s\u201D jest niepoprawnym ciągiem
+
+# używane przez org.w3c.css.values.CssURL
+error.url: \u201E%s\u201D jest niepoprawnym URL
+
+# używane przez org.w3c.css.values.CssColor
+error.rgb: \u201E%s\u201D nie jest poprawnym kolorem 3 lub 6 liczb szesnastkowych 
+error.colorfunc: \u201E%s1\u201D nie jest poprawnym kolorem %s2 
+error.angle: \u201E%s\u201D nie jest poprawnym kątem. Wartość powinna być pomiędzy \u201E0\u201D i \u201E360\u201D
+
+# używane przez org.w3c.css.values.CssNumber
+error.zero: Jedynie \u201E0\u201D może być \u201E%s\u201D. Musisz wstawić jednostkę po liczbie
+warning.zero: Jedynie \u201E0\u201D może być \u201E%s\u201D. Musisz wstawić jednostkę po liczbie
+warning.dynamic: Wartości dynamiczne nie mogą być sprawdzane jako liczby bez jednostek. Należy ją określić za pomocą jednostki.
+
+# used by org.w3c.css.values.CssImage
+error.linear-gradient-missing-to: The first argument to the \201Elinear-gradient\u201D function should be \201E%s\u201D, not \201E%s\u201D
+
+#używane przez org.w3c.css.properties.CssColumnCount
+error.strictly-positive: \u201E%s\u201D jest niepoprawny, dozwolone są jedynie wartości większe od \u201E0\u201D.
+
+error.greaterequal: \u201E%s\u201D jest niepoprawną wartością, dozwolone są tylko wartości wyższe bądź równe \u201E%s\u201D.
+error.lowerequal: \u201E%s\u201D jest niepoprawną wartością, dozwolone są tylko wartości niższe bądź równe \u201E%s\u201D.
+error.lower: \u201E%s\u201D jest niepoprawną wartością, dozwolone są tylko wartości ściśle niższe niż \u201E%s\u201D.
+
+error.greaterequal: \u201E%s\u201D jest niepoprawną wartością, dozwolone są tylko wartości wyższe bądź równe \u201E%s\u201D.
+error.greater: \u201E%s\u201D jest niepoprawną wartością, dozwolone są tylko wartości ściśle większe niż \u201E%s\u201D.
+
+# używane przez org.w3c.css.parser.CssPropertyFactory 
+error.noexistence-at-all: Właściwość \u201E%s\u201D nie istnieje
+error.noexistence: Właściwość \u201E%s\u201D nie istnieje w \u201E%s\u201D, ale istnieje w \u201E%s\u201D
+error.noexistence-media: Właściwość \u201E%s\u201D nie istnieje dla medium \u201E%s\u201D
+error.noexistence-typo: Właściwość \u201E%s\u201D nie istnieje. Najbliższa pasująca nazwa właściwości to \u201E%s\u201D
+warning.noexistence: Właściwość \u201E%s\u201D nie istnieje w \u201E%s\u201D, ale istnieje w \u201E%s\u201D
+warning.noexistence-media: Właściwość \u201E%s\u201D nie istnieje dla medium \u201E%s\u201D
+warning.notforusermedium: Właściwość \u201E%s\u201D nie istnieje dla tego medium użytkownika
+warning.noothermedium: Właściwość dla innych mediów może nie działać dla medium użytkownika
+warning.vendor-extension: \201E%s\u201D jest rozszerzeniem dostawcy
+warning.vendor-ext-pseudo-class: \u201E%s\u201D jest pseudo-klasą rozszerzenia dostawcy
+warning.vendor-ext-pseudo-element: \u201E%s\u201D jest pseudo-elementem rozszerzenia dostawcy
+warning.css-variable: Ze względu na ich dynamiczny charakter, zmienne CSS nie są obecnie sprawdzane statycznie
+
+warning.css-hack: \201E%s\u201D to hack CSS
+
+# używane przez org.w3c.css.parser.AtRule*
+error.noatruleyet: Inne @rules poza @import nie są wspierane przez CSS1 \u201E%s\u201D
+# używane przez org.w3c.css.parser.analyzer.CssParser
+error.notforcss1: Wartość \u201E%s\u201D nie istnieje w CSS1
+warning.pseudo: Nieznany pesudo-element lub pseudo-klasa \u201E%s\u201D w domyślnym profilu (\u201E%s\u201D)
+warning.nocomb: Kombinator \u201E%s\u201D pomiędzy selektorami nie jest dozwolony w tym profilu (\u201E%s\u201D)
+warning.charsetspecial: Ten profil ma bardzo określoną składnię dla @charset: \
+@charset dokładnie jedna spacja, nazwa kodowania w cudzysłowie, średnik.
+warning.notversion: \u201E%s\u201D nie może zostać użyty z tą wersją CSS: \u201E%s\u201D
+
+# używane przez org.w3c.css.parser.CssFouffa
+error.unrecognize: Zbyt dużo wartości lub wartości nierozpoznane
+
+# używane przez org.w3c.css.parser.CssFouffa
+generator.unrecognize: Błąd parsowania
+generator.dontmixhtml: Błąd parsowania: Arkusz stylów nie powinien zawierać składni HTML.
+
+# używane przez org.w3c.css.css.StyleSheetGeneratorHTML2
+error.unknown: Nieznany błąd
+
+# używane przez org.w3c.css.parser.CssSelectors
+error.pseudo-element: Pseudo-element \u201E%s\u201D nie może pojawić się w następującym kontekście \u201E%s\u201D
+error.pseudo-element-not-last: Selektor \u201E%s\u201D nie może pojawić się po selektorze pseudo-elementu \u201E%s\u201D
+error.pseudo-class: Pseudo-class .\u201E%s\u201D nie może pojawić się w następującym kontekście HTML \u201E%s\u201D
+error.pseudo: Nieznany pseudo-element lub pseudo-class \u201E%s\u201D
+error.id: Selektor ID #\u201E%s\u201D jest niepoprawny ! Tylko jeden selektor ID może być określony w selektorze prostym: \u201E%s\u201D.
+error.space: Jeśli stosuje się selektor atrybutu ~=, wyraz w wartości \u201E%s\u201D nie może zawierać spacji.
+warning.space: Jeśli stosuje się selektor atrybutu ~=, wyraz w wartości \u201E%s\u201D nie powinien zawierać spacji.
+error.todo: Niestety, ale funkcja \u201E%s\u201D nie została jeszcze wdrożona.
+error.incompatible: \u201E%s\u201D i \u201E%s\u201D są niekompatybilne
+warning.incompatible: \u201E%s\u201D i \u201E%s\u201D są niekompatybilne
+error.notformobile: \u201E%s\u201D nie może być zastosowany w profilu mobilnym
+error.notforatsc: \u201E%s\u201D nie może być zastosowany w profilu ATSC
+error.notfortv: \u201E%s\u201D nie może być zastosowany w profilu TV
+error.notversion: \u201E%s\u201D nie może być zastosowany w tej wersji CSS : \u201E%s\u201D
+
+error.media: nierozpoznane mediium \u201E%s\u201D 
+error.page: nierozpoznana pseudonimowa strona \u201E%s\u201D
+
+error.unrecognized.link: Nierozpoznany element łącza lub instrukcji przetwarzania xml-stylesheet..
+
+# używane przez StyleSheetGeneratorHTML
 generator.context: Kontekst
-generator.request: Wystšpił błšd podczas przetwarzania twojego arkusza stylów. \
-Proszę ponowić proœbę lub wysłać e-mail pod adres plh@w3.org.
+generator.request: Wystąpił błąd podczas przetwarzania twojego arkusza stylów. \
+Proszę ponowić prośbę lub wysłać e-mail pod adres plh@w3.org.
 generator.unrecognized: Nierozpoznane
-generator.invalid-number: Niepoprawny numer
-generator.property: Niepoprawny numer
+generator.invalid-number: Nieprawidłowa liczba
+generator.property: Niepoprawna wartość
 generator.line: Linia
 generator.not-found: Pliku nie znaleziono
-generator.doc-html: 
-generator.doc:
 
+generator.doc-html:   
+generator.doc:  
 
-# użyte przez parser
-parser.semi-colon: próba znalezienia œrednika przed nazwš właœciwoœci. Dodaj go
 
-parser.unknown-dimension: Nieznany wymiar
+# używane przez parser
+parser.semi-colon: Brak średnika przed nazwą właściwości \u201E%s\u201D. Dodaj go
 
+parser.unknown-dimension: Nieznany wymiar
 
-parser.old_class: W CSS1, nazwa klasy może zaczšć się od cyfry (".55ft"), \
-chyba, że jest to wymiar (".55in"). W CSS2 takie klasy sš parsowane jako \
-nieznane wymiary (aby pozwolić na póŸniejsze dodawanie jednostek)
+parser.old_class: W CSS1, nazwa klasy może zacząć się od cyfry (".55ft"), \
+chyba że jest to wymiar (".55in"). W CSS2 takie klasy są parsowane jako \
+nieznane wymiary (aby umożliwić dodawanie nowych jednostek w przyszłości)
+Aby \u201E%s\u201D stała się poprawną klasą, CSS2 wymaga, aby pominąć pierwszą cyfrę: \u201E%s\u201D
 
-parser.old_id:W CSS1 nazwa id może zaczšć się od cyfry("#55ft"), \
-chyba, że jest to wymiar ("#55in"). W CSS2 takie klasy sš parsowane jako \
-nieznane wymiary (aby pozwolić na póŸniejsze dodawanie jednostek)
+parser.old_id: W CSS1 nazwa id może zacząć się od cyfry ("#55ft"), \
+chyba że jest to wymiar ("#55in"). W CSS2 takie klasy są parsowane jako \
+nieznane wymiary (aby umożliwić dodawanie nowych jednostek w przyszłości)
 
-parser.class_dim:W CSS1 nazwa klasy może zaczšć się od cyfry (".55ft"), \
-chyba, że jest to wymiar (".55in").
+parser.class_dim: W CSS1 nazwa klasy może zacząć się od cyfry (".55ft"), \
+chyba że jest to wymiar (".55in").
 
-parser.id_dim:W CSS1 nazwa id  może zaczšć się od cyfry ("#55ft"), \
-chyba, że jest to wymiar ("#55in").
+parser.id_dim: W CSS1 nazwa id może zacząć się od cyfry ("#55ft"), \
+chyba że jest to wymiar ("#55in").
 
-parser.charset:Reguła @charset może pojawić się jedynie na poczštku \
-arkusza. Upewnij się, że nie ma przed niš spacji.
+parser.charset: Reguła @charset może pojawić się jedynie na początku \
+arkusza stylów. Upewnij się, że nie ma przed nią spacji.
 
-parser.charsetspecial:Ten profil ma specyficzny syntax dla @charset: \
-@charset dokładnie po jednej spacji a następnie nazwa kodowania \
-w cudzysłowie zakończona bezpoœrednio œrednikiem.
+parser.charsetspecial: Ten profil ma określoną składnię dla @charset: \
+@charset dokładnie jedna spacja, nazwa kodowania w cudzysłowie, średnik.
 
-warning.old_id:W CSS1 nazwa id  może zaczšć się od cyfry ("#55ft"), \
-chyba, że jest to wymiar ("#55in"). W CSS2 takie klasy sš parsowane jako \
-nieznane wymiary (aby pozwolić na póŸniejsze dodawanie jednostek)
+warning.old_id: W CSS1 nazwa id może zacząć się od cyfry ("#55ft"), \
+chyba że jest to wymiar ("#55in"). W CSS2 takie klasy są parsowane jako \
+nieznane wymiary (aby umożliwić dodawanie nowych jednostek w przyszłości)
 
-warning.old_class:In CSS1, a class name can start with a digit ("#55ft"), \
-chyba, że jest to wymiar ("#55in"). W CSS2 takie klasy sš parsowane jako \
-nieznane wymiary (aby pozwolić na póŸniejsze dodawanie jednostek)
+warning.old_class:W CSS1, nazwa klasy może zacząć się od cyfry ("#55ft"), \
+chyba że jest to wymiar ("#55in"). W CSS2 takie klasy są parsowane jako \
+nieznane wymiary (aby umożliwić dodawanie nowych jednostek w przyszłości)
 
-# użyte przez servlet
-servlet.invalid-request: Wysłałeœ niewłaœciwe polecenie.
+# używane przez servlet
+servlet.invalid-request: Wysłałeś nieprawidłowe żądanie.
 servlet.process: Nie można przetworzyć obiektu
 
-warning.atsc : \u201C%s\u201D może nie być wspieranym przez medium atsc-tv
-error.onlyATSC : \u201C%s\u201D ta funkcja jest jedynie dla medium atsc-tv
+warning.atsc: \u201E%s\u201D może nie być wspierane przez medium atsc-tv
+error.onlyATSC: \u201E%s\u201D ta funkcja jest jedynie dla medium atsc-tv
 
-warning.otherprofile : właœciwoœć \u201C%s\u201D nie istnieje dla tego profilu, ale wykazuje zgodnoœć z innym profilem
+warning.otherprofile: właściwość \u201E%s\u201D nie istnieje dla tego profilu, ale wykazuje zgodność z innym profilem
+warning.deprecated: Wartość \u201E%s\u201D jest przestarzała
+warning.deprecatedproperty: Właściwość \u201E%s\u201D jest przestarzała
+warning.deprecated_replacement: Wartość \u201E%s1\u201D jest przestarzała, zamiast jej użyj \u201E%s2\u201D
 
 warning.float-no-width: W (x)HTML+CSS elementy pływające muszą mieć określoną szerokość. Nie dotyczy to tylko elementów z szerokością przypisaną domyślnie (html, img, input, textarea, select i object)
+
 parser.charsetcss1: Reguły @charset nie mogą być używane w CSS1
 parser.attrcss1: Selektory atrybutów są nieprawidłowe w CSS1
+
 parser.invalid_id_selector: Nieprawidłowy selektor ID
 parser.import_not_allowed: Wyrażenie @import nie może występować po żadnym z istniejących wyrażeń, z wyjątkiem @charset i @import.
-error.divisortype: Dzielnik musi być liczbą
-error.divzero: Dzielenie przez zero
-error.invalidtype: Niepoprawny typ: \u201C%s\u201D
-vext_warnings: Ostrzeżenia
-vext_errors: Błędy
-error.selectorname: Niepoprawna nazwa selektora \u201C%s\u201D
-warning.lowerequal: wartość \u201C%s\u201D będzie interpretowana jako \u201C%s\u201D
 
-error.incompatibletypes: Type są niekompatybilne
+error.bg_order: W definicji tła w CSS-ie 3 \u201Ebg_position\u201D musi wystąpić przed / \u201Ebg_size\u201D, jeśli oba są obecne
+
+warning.deprecatedmedia: Medium \u201E%s\u201D jest przestarzałe
+error.deprecatedmedia: Medium \u201E%s\u201D jest przestarzałe
+error.deprecatedmediafeature: Deprecated media feature \201E%s\u201D. For guidance, see the Deprecated Media Features section in the current Media Queries specification.
+warning.deprecatedmediafeature: Deprecated media feature \201E%s\u201D. For guidance, see the Deprecated Media Features section in the current Media Queries specification.
+error.nomediarestrictor: Ogranicznik mediów nie jest zdefiniowany w tym poziomie CSS
+error.nomediafeature: Cechy mediów nie są zdefiniowane w tym poziomie CSS
+error.nomodifiershortmedia: Prefiksy nie są dozwolone dla cech mediów bez przypisanej wartości
+error.nomodifiermedia: Cecha mediów \201E%s\u201D nie obsługuje prefiksów
+error.grid: Tylko wartości \201E0\u201D i \201E1\u201D są akceptowalne dla cechy grid
+
+error.errortoken: Nieoczekiwana zawartość \u201E%s\u201D w wierszu \u201E%s\u201D, oczekiwano tokena \u201E%s\u201D (pominięto \u201E%s\u201D)
+error.selectorname: Niepoprawna nazwa selektora \u201E%s\u201D
+
+# calc
+
+parser.calcwhitespace: Białe znaki są wymagane po obu stronach operatora \u201E+\u201D lub \u201E-\u201D
+error.divzero: Dzielenie przez zero
 error.operandnumber: Jeden argument musi być liczbą
-parser.calcwhitespace: Białe znaki są wymagane po obu stronach operatora '+' lub '-'
-warning.deprecated: Wartość '\u201C%s\u201D' jest przestarzała
-warning.negative: ujemna wartość \u201C%s\u201D będzie interpretowana jako 0
-warning.shape-separator: Niewłaściwy separator w definicji kształtu. Wymagany jest przecinek.
-warning.greaterequal: wartość \u201C%s\u201D będzie interpretowana jako \u201C%s\u201D
-error.bg_order: W definicji tła w CSS-ie 3 'bg_position' musi wystąpić przed / 'bg_size', jeśli oba są obecne
-
-warning.deprecatedproperty: Własność \u201C%s\u201D jest przestarzała
-error.strictly-positive: \u201C%s\u201D jest niepoprawny, dozwolone są jedynie wartości większe od 0.
-error.typevaluemismatch: Wartość \u201C%s\u201D jest niekompatybilna z zadeklarowanym typem <\u201C%s\u201D>
-vendorext: Rozszerzenia Dostawców
-warning.deprecatedmedia: Medium "\u201C%s\u201D" jest przestarzałe
-error.deprecatedmedia: Medium "\u201C%s\u201D" jest przestarzałe
-warning.noexproperty: Właściwość \u201C%s\u201D nie istnieje
-error.errortoken: Nieoczekiwana zawartość "\u201C%s\u201D" w wierszu \u201C%s\u201D, oczekiwano tokena \u201C%s\u201D (pominięto \u201C%s\u201D)
-warning.vendor-ext-pseudo-element: \u201C%s\u201D jest nieznanym przedrostkiem pseudo-elementu
-warning.vendor-ext-pseudo-class: \u201C%s\u201D jest nieznanym przedrostkiem pseudo-klasy
-
-error.lower: \u201C%s\u201D jest nieprawidłową wartością, dozwolone są tylko wartości ściśle niższe niż \u201C%s\u201D.
-error.lowerequal: \u201C%s\u201D jest nieprawidłową wartością, dozwolone są tylko wartości niższe bądź równe \u201C%s\u201D.
-error.greater: \u201C%s\u201D jest nieprawidłową wartością, dozwolone są tylko wartości ściśle większe niż \u201C%s\u201D.
-error.greaterequal: \u201C%s\u201D jest niedozwoloną wartością, dozwolone są tylko wartości wyższe bądź równe \u201C%s\u201D.
+error.divisortype: Dzielnik musi być liczbą
+error.incompatibletypes: Type są niekompatybilne
+error.invalidtype: Niepoprawny typ: \u201E%s\u201D
+error.typevaluemismatch: Wartość \u201E%s\u201D jest niekompatybilna z zadeklarowanym typem <\u201E%s\u201D>
+
+error.emptymedia: W CSS2 typ mediów w @media jest obowiązkowy
+
+error.email: To narzędzie nie może być używane z adresami e-mail. Wprowadź prawidłowy adres URL i spróbuj ponownie.
 
+error.nomodifierrangemedia: Nie są dozwolone prefiksy dla cech zakresu mediów.
+error.comparator: Komparatory \201E%s\u201D i \201E%s\u201D nie są zgodne w funkcji multimedialnej typu \201Erange\u201D
+warning.comparator: Komparatory \201E%s\u201D i \201E%s\u201D są takie same, jeden z nich zostanie zignorowany.
diff --git a/org/w3c/css/util/Messages.properties.pt-BR b/org/w3c/css/util/Messages.properties.pt-BR
index 17dbebdcf..ef2ed046e 100644
--- a/org/w3c/css/util/Messages.properties.pt-BR
+++ b/org/w3c/css/util/Messages.properties.pt-BR
@@ -58,7 +58,7 @@ validate_by_input: Validar por entrada direta
 enter_CSS: Entre as CSS que você gostaria de validar
 submit_input: Enviar CSS para validação
 note: Nota
-note_xhtml_valid: Para validar uma folha de estilo CSS incorporada a um documento (X)HTML você deverá, primeiramente, verificar se a marcação (X)HTML é válida
+note_xhtml_valid: Para validar uma folha de estilo CSS incorporada a um documento (X)HTML você deverá, primeiramente, verificar se a marcação (X)HTML é válida
 # End of variables added along with Index page template
 
 W3C_validator_results: Resultados da validação CSS do W3C para
@@ -93,7 +93,7 @@ com a finalidade de facilitar futuras revalidações, ou mesmo permitir que seus
 verifiquem a validação da página, o endereço URI é mostrado a seguir:
 no_errors_forHTML_only_msg: Somente para documentos HTML/XML
 no_errors_bookmark_msg: Ou, você pode adicionar esta página à sua lista de favoritos.
-note_valide_html: Para surtir os efeitos de estilização pretendidos sua folha de estilo CSS precisa estar atrelada a um documento capaz de criar uma árvore possível de ser parseada. Em outras palavras: o documento deverá estar escrito em linguagem HTML válida.
+note_valide_html: Para surtir os efeitos de estilização pretendidos sua folha de estilo CSS precisa estar atrelada a um documento capaz de criar uma árvore possível de ser parseada. Em outras palavras: o documento deverá estar escrito em linguagem HTML válida.
 top: Topo
 # hook_html_validator 
 not-css1-style: /* CUIDADO ! Essa não é uma propriedade CSS1 válida ! */
diff --git a/org/w3c/css/util/Messages.properties.ro b/org/w3c/css/util/Messages.properties.ro
index e453d333b..cbe952837 100644
--- a/org/w3c/css/util/Messages.properties.ro
+++ b/org/w3c/css/util/Messages.properties.ro
@@ -54,7 +54,7 @@ validate_by_input: Validare prin introducere directa a codului
 enter_CSS: Introdu CSS-ul pe care vrei sa il validezi
 submit_input: Trimite codul pentru validare
 note: Nota
-note_xhtml_valid: Daca vrei sa validezi CSS-ul inclus intr-un document (X)HTML, ar trebui mai intai sa verifici daca documentul (X)HTML pe care il folosesti este valid
+note_xhtml_valid: Daca vrei sa validezi CSS-ul inclus intr-un document (X)HTML, ar trebui mai intai sa verifici daca documentul (X)HTML pe care il folosesti este valid
 # End of variables added along with Index page template
 
 W3C_validator_results: Rezultatele Validatorului W3C
@@ -82,7 +82,7 @@ no_errors_dl_local_msg: Daca vrei, poti descarca o copie a acestei imagini pentr
 no_errors_create_link_msg: Daca vrei sa creezi un link catre aceasta pagina pentru a revalida mai usor in viitor sau sa permiti altora sa valideze pagina ta, URI-ul este:
 no_errors_forHTML_only_msg: Doar pentru documente HTML/XML 
 no_errors_bookmark_msg: Sau, poti doar sa adaugi pagina actuala la marcaje (bookmark-uri)
-note_valide_html: Pentru a functiona cu ar trebui, foile de stil CSS au nevoie de o graf orientat aciclic corect. Asta inseamna ca trebuie sa folosesti un HTML valid.
+note_valide_html: Pentru a functiona cu ar trebui, foile de stil CSS au nevoie de o graf orientat aciclic corect. Asta inseamna ca trebuie sa folosesti un HTML valid.
 top: Top
 # hook_html_validator 
 not-css1-style: /* Atentie! Aceasta nu este o proprietate CSS1! */
diff --git a/org/w3c/css/util/Messages.properties.ru b/org/w3c/css/util/Messages.properties.ru
index 1c5cbceeb..58e913f1e 100644
--- a/org/w3c/css/util/Messages.properties.ru
+++ b/org/w3c/css/util/Messages.properties.ru
@@ -55,7 +55,7 @@ validate_by_input: Проверка набираемого текста
 enter_CSS: Введите код CSS, который вы хотели бы проверить на корректность
 submit_input: Проверить введенные данные
 note: Примечание
-note_xhtml_valid: Если вы хотите проверить каскадные таблицы стилей, встроенные в документ (X)HTML, вы должны сначала проверить на корректность сам документ (X)HTML
+note_xhtml_valid: Если вы хотите проверить каскадные таблицы стилей, встроенные в документ (X)HTML, вы должны сначала проверить на корректность сам документ (X)HTML
 # End of variables added along with Index page template
 
 W3C_validator_results: W3C результаты проверки CSS для
@@ -86,7 +86,7 @@ no_errors_create_link_msg: Если Вы хотите создать ссылк
 no_errors_forHTML_only_msg: только для документов HTML/XML
 no_errors_bookmark_msg: Или можете просто добавить данную страницу в закладки.
 note_valide_html: Для корректной работы сервиса проверки CSS необходимо чтобы ваши документы \ 
-имели правильную древовидную разметку. Это обозначает, что вы должны использовать корректный HTML.
+имели правильную древовидную разметку. Это обозначает, что вы должны использовать корректный HTML.
 top: Наверх
 # hook_html_validator 
 not-css1-style: /* ОСТОРОЖНО! Не является свойством CSS1 ! */
diff --git a/org/w3c/css/util/Messages.properties.sv b/org/w3c/css/util/Messages.properties.sv
index d14d36d92..d4d77d51e 100644
--- a/org/w3c/css/util/Messages.properties.sv
+++ b/org/w3c/css/util/Messages.properties.sv
@@ -56,7 +56,7 @@ validate_by_input: Validera genom direkt inmatning
 enter_CSS: Mata in den CSS du vill validera
 submit_input: Skicka in data för validering
 note: Märk
-note_xhtml_valid: Om du vill validera din CSS-formatmall inbäddad i ett (X)HTML-dokument, så bör du först kontrollera att den (X)HTML du använder är giltig
+note_xhtml_valid: Om du vill validera din CSS-formatmall inbäddad i ett (X)HTML-dokument, så bör du först kontrollera att den (X)HTML du använder är giltig
 # End of variables added along with Index page template
 
 W3C_validator_results: W3C CSS-valideringsresultat för
@@ -90,7 +90,7 @@ resultat) för att göra det lättare att validera denna sida i framtiden, eller
 andra validera dina sidor, använd då URI:en: 
 no_errors_forHTML_only_msg: enbart för HTML-/XML-dokument
 no_errors_bookmark_msg: Eller så kan du helt enkelt lägga till denna sida till dina bokmärken eller snabblänkar.
-note_valide_html: För att fungera som avsett, så behöver din CSS-formatmall ett korrekt dokumentparseträd. Detta betyder att du bör använda valid HTML.
+note_valide_html: För att fungera som avsett, så behöver din CSS-formatmall ett korrekt dokumentparseträd. Detta betyder att du bör använda valid HTML.
 top: Toppen
 # hook_html_validator 
 not-css1-style: /* VAR FÖRSIKTIG! Detta är inte en CSS1-egenskap! */
diff --git a/org/w3c/css/util/Messages.properties.uk b/org/w3c/css/util/Messages.properties.uk
index 7f82d42f5..f9824665d 100644
--- a/org/w3c/css/util/Messages.properties.uk
+++ b/org/w3c/css/util/Messages.properties.uk
@@ -53,7 +53,7 @@ validate_by_input: Перевірка тексту, що набирається
 enter_CSS: Уведіть код CSS, що ви хотіли б перевірити на коректність
 submit_input: Перевірити уведені дані
 note: Примітка
-note_xhtml_valid: Якщо ви хочете перевірити каскадні таблиці стилів, вбудовані до документу (X)HTML, ви повинні спершу перевірити на коректність сам документ (X)HTML
+note_xhtml_valid: Якщо ви хочете перевірити каскадні таблиці стилів, вбудовані до документу (X)HTML, ви повинні спершу перевірити на коректність сам документ (X)HTML
 # End of variables added along with Index page template
 
 W3C_validator_results: W3C результати перевірки CSS для
@@ -84,7 +84,7 @@ no_errors_create_link_msg: Якщо Ви бажаєте створити пос
 no_errors_forHTML_only_msg: лише для документів HTML/XML
 no_errors_bookmark_msg: Або можее просто додати цю сторінку до закладок.
 note_valide_html: Для коректної роботи сервіса перевірки CSS необхідно щоб ваші документи \ 
-мали правильну деревоподібну размітку. Це означає, що ви повинні використовувати коректний HTML.
+мали правильну деревоподібну размітку. Це означає, що ви повинні використовувати коректний HTML.
 top: Наверх
 # hook_html_validator 
 not-css1-style: /* ОБЕРЕЖНО! Не є властивістю CSS1 ! */
diff --git a/org/w3c/css/util/Messages.properties.zh-cn b/org/w3c/css/util/Messages.properties.zh-cn
index 39b6aadc6..1ef8628a0 100644
--- a/org/w3c/css/util/Messages.properties.zh-cn
+++ b/org/w3c/css/util/Messages.properties.zh-cn
@@ -58,7 +58,7 @@ validate_by_input: 验证直接输入的内容
 enter_CSS: 输入你要验证的CSS代码
 submit_input: Submit your input for validation
 note: 注意
-note_xhtml_valid: 如果你想验证一段嵌入在HTML或者XHTML文档中的CSS，你首先要验证你的HTML或者XHTML文档是正确的。
+note_xhtml_valid: 如果你想验证一段嵌入在HTML或者XHTML文档中的CSS，你首先要验证你的HTML或者XHTML文档是正确的。
 # End of variables added along with Index page template
 
 W3C_validator_results: W3C CSS 校验器结果：  
@@ -78,20 +78,15 @@ congrats: 恭喜恭喜
 # variables because the position of the link in the sentence varies in different languages
 doc_validates_before_link: 恭喜恭喜，此文档已经通过
 doc_validates_after_link: 校验!
-no_errors_interoperable_msg: 为了告诉你的访客你曾致力于建立交互性的网页 \
-你可以显示这个图标在任意经过检验的网页上。这里是 \
-你用作加入图标到你的网页上的HTML代码：
+no_errors_interoperable_msg: 为了告诉你的访客你曾致力于创建具有交互性的网页，你可以在任意经过检验的网页上显示这个图标。添加图标的HTML代码：
 valid_CSS: Valid CSS!
 # 
 no_errors_close_tags_msg: close the img tag with > instead of /> if using HTML <= 4.01
-no_errors_dl_local_msg: 如果你喜欢的话，你可以下载这个图象到你的网站目录下，并且 \
-改变以上的代码段以关联到你的当地图象而不是这个服务器。 
-no_errors_create_link_msg: 如果你愿意建立连接到此页 (例如，这个校验结果) \
-以便以后更加容易地再校验次页，或者容许其它人校验 \
-你的网页，其 URI 是：
+no_errors_dl_local_msg: 如果你喜欢的话，你可以下载这个图象到你的网站目录下，并且改变以上的代码段以关联到你的当地图象而不是这个服务器。 
+no_errors_create_link_msg: 如果你愿意链接到此页（比如这个校验结果）以便以后更加容易地再校验此页，或者容许其它人校验你的网页，其 URI 是：
 no_errors_forHTML_only_msg: 仅使用于HTML文档
-no_errors_bookmark_msg: 或者，你可以加入当前也到你的书签或列表中。
-note_valide_html: 如果你想验证一段嵌入在HTML或者XHTML文档中的CSS，你首先要验证你的HTML或者XHTML文档是正确的。 
+no_errors_bookmark_msg: 或者，你可以把当前页添加到你的书签或列表中。
+note_valide_html: 如果你想验证一段嵌入在HTML或者XHTML文档中的CSS，你首先要验证你的HTML或者XHTML文档是正确的。 
 top: Top
 # hook_html_validator 
 not-css1-style: /* 请注意！这不是CSS1的属性！ */
diff --git a/org/w3c/css/util/UnescapeFilterReader.java b/org/w3c/css/util/UnescapeFilterReader.java
index 2a5af9d17..3e68518f3 100644
--- a/org/w3c/css/util/UnescapeFilterReader.java
+++ b/org/w3c/css/util/UnescapeFilterReader.java
@@ -29,10 +29,7 @@ public int read()
             return 0x000a;// U+000A LINE FEED (LF)
         }
         if (c == 0) { // U+0000 NULL
-            return 0xffd; // U+FFFD REPLACEMENT CHARACTER
-        }
-        if (c >= 0xd800 && c <= 0xdfff) { // surrogate
-            return 0xfffd;
+            return 0xfffd; // U+FFFD REPLACEMENT CHARACTER
         }
 
         // now specific case of CSS unicode escape for ascii values [A-Za-z0-9].
@@ -53,11 +50,11 @@ public int read()
                 val = (val << 4) + (esc - 87);
             } else if (esc == 10 || esc == 9 || esc == 32) { // CSS whitespace.
                 // U+000A LINE FEED, U+0009 CHARACTER TABULATION, or U+0020 SPACE.
-                if ((val > 96 && val < 124) || (val > 64 && val < 91)) {
+                if ((val > 96 && val < 123) || (val > 64 && val < 91)) {
                     return val;
                 }
             } else {
-                if ((val > 96 && val < 124) || (val > 64 && val < 91)) {
+                if ((val > 96 && val < 123) || (val > 64 && val < 91)) {
                     //we must unread 1
                     in.reset();
                     i++;
@@ -71,7 +68,7 @@ public int read()
             }
         }
         // we read up to 6 char test value first
-        if ((val <= 96 || val >= 124) && (val <= 64 || val >= 91)) {
+        if ((val <= 96 || val >= 123) && (val <= 64 || val >= 91)) {
             in.reset();
             return c;
         }
@@ -108,8 +105,6 @@ public int read(char[] cbuf, int off, int len) throws IOException {
                 chars[j++] = 0x000a;
             } else if (chars[i] == 0) {
                 chars[j++] = 0xfffd;
-            } else if (chars[i] >= 0xd800 && chars[i] <= 0xdfff) {
-                chars[j++] = 0xfffd;
             }
             // escaping
 
@@ -129,7 +124,7 @@ public int read(char[] cbuf, int off, int len) throws IOException {
                         val = (val << 4) + (cki - 87);
                     } else if (cki == 10 || cki == 9 || cki == 32) { // CSS whitespace.
                         // U+000A LINE FEED, U+0009 CHARACTER TABULATION, or U+0020 SPACE.
-                        if ((val > 96 && val < 124) || (val > 64 && val < 91)) {
+                        if ((val > 96 && val < 123) || (val > 64 && val < 91)) {
                             chars[j++] = (char) val;
                             escaped = true;
                             i += k;
@@ -140,26 +135,27 @@ public int read(char[] cbuf, int off, int len) throws IOException {
                         break;
                     } else {
                         if (val == 0) {
-                            if ((cki > 96 && cki < 124) || (cki > 64 && cki < 91)) {
+                            if ((cki > 96 && cki < 123) || (cki > 64 && cki < 91)) {
                                 // so we found a regular char, just remove the escaping
                                 ++i;
                                 ignoreEscape = true;
                                 break;
                             }
                         }
-                        if ((val > 96 && val < 124) || (val > 64 && val < 91)) {
+                        if ((val > 96 && val < 123) || (val > 64 && val < 91)) {
                             chars[j++] = (char) val;
                             escaped = true;
                             i += k - 1;
                             break;
                         } else {
                             ignoreEscape = true;
+                            break;
                         }
                     }
                 }
                 if (!ignoreEscape) {
                     if (k == 7 && !escaped) {
-                        if ((val > 96 && val < 124) || (val > 64 && val < 91)) {
+                        if ((val > 96 && val < 123) || (val > 64 && val < 91)) {
                             chars[j++] = (char) val;
                             escaped = true;
                             i += k - 1;
diff --git a/org/w3c/css/values/CssANPlusB.java b/org/w3c/css/values/CssANPlusB.java
index 58c7f937c..8ee4eb61e 100644
--- a/org/w3c/css/values/CssANPlusB.java
+++ b/org/w3c/css/values/CssANPlusB.java
@@ -206,7 +206,9 @@ public String toString() {
                 sb.append('n');
             }
             if (b != null) {
-                sb.append(operator);
+                if (operator != 0) {
+                    sb.append(operator);
+                }
                 sb.append(b.toPlainString());
             }
             representation = sb.toString();
diff --git a/org/w3c/css/values/CssCalc.java b/org/w3c/css/values/CssCalc.java
index e2fb45c51..ae203c3e5 100644
--- a/org/w3c/css/values/CssCalc.java
+++ b/org/w3c/css/values/CssCalc.java
@@ -39,8 +39,6 @@ public final int getType() {
     boolean hasParen = false;
     String _toString = null;
     boolean implicit_function = true;
-    boolean contains_variable = false;
-
 
     /**
      * Create a new CssCalc
@@ -72,14 +70,6 @@ public CssCalc(ApplContext ac, CssValue value) {
         val1 = value;
     }
 
-    public boolean hasCssVariable() {
-        return contains_variable;
-    }
-
-    public void markCssVariable() {
-        contains_variable = true;
-    }
-
     public void setImplicitFunction(boolean v) {
         implicit_function = v;
         _toString = null;
diff --git a/org/w3c/css/values/CssCheckableValue.java b/org/w3c/css/values/CssCheckableValue.java
index ec26cc249..4be4de347 100644
--- a/org/w3c/css/values/CssCheckableValue.java
+++ b/org/w3c/css/values/CssCheckableValue.java
@@ -21,6 +21,15 @@ public abstract class CssCheckableValue extends CssValue {
 
     abstract public boolean isZero();
 
+    boolean contains_variable = false;
+
+    public boolean hasCssVariable() {
+        return contains_variable;
+    }
+
+    public void markCssVariable() {
+        contains_variable = true;
+    }
 
     /**
      * check if the value is positive or null
diff --git a/org/w3c/css/values/CssClamp.java b/org/w3c/css/values/CssClamp.java
deleted file mode 100644
index a2645663c..000000000
--- a/org/w3c/css/values/CssClamp.java
+++ /dev/null
@@ -1,395 +0,0 @@
-//
-// @author Yves Lafon 
-//
-// (c) COPYRIGHT MIT, ERCIM, Keio, Beihang, 2020.
-// Please first read the full copyright statement in file COPYRIGHT.html
-
-package org.w3c.css.values;
-
-import org.w3c.css.util.ApplContext;
-import org.w3c.css.util.InvalidParamException;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-
-/**
- * CSS clamp().
- *
- * @spec https://www.w3.org/TR/2019/WD-css-values-4-20190131/#funcdef-clamp
- */
-public class CssClamp extends CssCheckableValue {
-
-    public static final int type = CssTypes.CSS_CLAMP;
-
-    public final int getRawType() {
-        return type;
-    }
-
-    public final int getType() {
-        if (computed_type == CssTypes.CSS_CLAMP) {
-            return type;
-        }
-        return computed_type;
-    }
-
-    ApplContext ac;
-    int computed_type = CssTypes.CSS_UNKNOWN;
-    ArrayList values = null;
-    String _toString = null;
-
-
-    /**
-     * Create a new CssClamp
-     */
-    public CssClamp() {
-    }
-
-    public CssClamp(ApplContext ac, CssValue v1, CssValue v2, CssValue v3) {
-        this.ac = ac;
-
-        values = new ArrayList<>();
-        values.add(v1);
-        values.add(v2);
-        values.add(v3);
-    }
-
-    public void set(String s, ApplContext ac) throws InvalidParamException {
-        // we don't support this way of setting the value
-        // as we rely on the parsing to create it incrementally
-        throw new InvalidParamException("unrecognize", s, ac);
-    }
-
-    public void setValue(BigDecimal d) {
-        // we don't support this way of setting the value
-        // as we rely on the parsing to create it incrementally
-    }
-
-    /**
-     * Add one operand, if we already got one we will... Add one operand.
-     *
-     * @param value
-     * @return
-     */
-    public CssClamp addValue(CssValue value)
-            throws InvalidParamException {
-        boolean first = false;
-        if (values == null) {
-            values = new ArrayList<>();
-            first = true;
-        }
-        values.add(value);
-        _computeResultingType();
-        return this;
-    }
-
-    public void validate() throws InvalidParamException {
-        _computeResultingType();
-    }
-
-    private int _checkAcceptableType(int type)
-            throws InvalidParamException {
-        //  , , , , , or 
-        if (type != CssTypes.CSS_PERCENTAGE &&
-                type != CssTypes.CSS_LENGTH &&
-                type != CssTypes.CSS_NUMBER &&
-                type != CssTypes.CSS_ANGLE &&
-                type != CssTypes.CSS_FREQUENCY &&
-                type != CssTypes.CSS_TIME) {
-            throw new InvalidParamException("invalidtype", toStringUnprefixed(), ac);
-        }
-        return type;
-    }
-
-    private void _computeResultingType()
-            throws InvalidParamException {
-        int valtype = CssTypes.CSS_MIN;
-        boolean firstVal = true;
-        CssValue prevVal = null;
-
-        for (CssValue v : values) {
-            if (firstVal) {
-                valtype = v.getType();
-                _checkAcceptableType(valtype);
-                computed_type = valtype;
-                firstVal = false;
-                prevVal = v;
-            } else {
-                if (valtype == v.getType()) {
-                    prevVal = v;
-                    continue;
-                }
-                if (valtype == CssTypes.CSS_PERCENTAGE) {
-                    valtype = _checkAcceptableType(v.getType());
-                    prevVal = v;
-                    continue;
-                }
-                if (v.getType() == CssTypes.CSS_PERCENTAGE) {
-                    continue;
-                }
-                if (valtype == CssTypes.CSS_NUMBER && prevVal.getNumber().isZero()) {
-                    valtype = _checkAcceptableType(v.getType());
-                    prevVal = v;
-                    continue;
-                }
-                if (v.getType() == CssTypes.CSS_NUMBER && v.getNumber().isZero()) {
-                    continue;
-                }
-                throw new InvalidParamException("incompatibletypes", toStringUnprefixed(), ac);
-            }
-        }
-        computed_type = valtype;
-    }
-
-    /**
-     * Returns the value
-     */
-
-    public Object get() {
-        return toString();
-    }
-
-    protected String toStringUnprefixed() {
-        StringBuilder sb = new StringBuilder();
-        boolean isFirst = true;
-        for (CssValue v : values) {
-            if (!isFirst) {
-                sb.append(", ");
-            } else {
-                isFirst = false;
-            }
-            sb.append(v);
-        }
-        return sb.toString();
-    }
-
-    public String toString() {
-        if (_toString == null) {
-            StringBuilder sb = new StringBuilder();
-            sb.append("clamp(").append(toStringUnprefixed()).append(')');
-            _toString = sb.toString();
-        }
-        return _toString;
-    }
-
-
-    public boolean isInteger() {
-        return false;
-    }
-
-    /**
-     * Returns true is the value is positive of null
-     *
-     * @return a boolean
-     */
-    public boolean isPositive() {
-        // TODO do our best...
-        return false;
-    }
-
-    /**
-     * Returns true is the value is positive of null
-     *
-     * @return a boolean
-     */
-    public boolean isStrictlyPositive() {
-        return false;
-        // TODO do our best...
-    }
-
-    /**
-     * Returns true is the value is zero
-     *
-     * @return a boolean
-     */
-    public boolean isZero() {
-        // TODO do our best...
-        return false;
-    }
-
-
-    /**
-     * Compares two values for equality.
-     *
-     * @param value The other value.
-     */
-    public boolean equals(Object value) {
-        if (!(value instanceof CssClamp)) {
-            return false;
-        }
-        CssClamp other = (CssClamp) value;
-        boolean match;
-        // this is inherently wrong, as we should check only the min value, but in that case we
-        // would need to explicitly compute them which is not done.
-        for (CssValue v : this.values) {
-            match = false;
-            for (CssValue ov : other.values) {
-                if (v.equals(ov)) {
-                    match = true;
-                    break;
-                }
-            }
-            if (!match) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * check if the value is positive or null
-     *
-     * @param ac         the validation context
-     * @param callername the property the value is defined in
-     * @throws InvalidParamException
-     */
-    public void checkPositiveness(ApplContext ac, String callername)
-            throws InvalidParamException {
-        // TODO do our best...
-        if (false /*!isPositive()*/) {
-            throw new InvalidParamException("negative-value",
-                    toString(), callername, ac);
-        }
-    }
-
-    /**
-     * check if the value is strictly positive
-     *
-     * @param ac         the validation context
-     * @param callername the property the value is defined in
-     * @throws InvalidParamException
-     */
-    public void checkStrictPositiveness(ApplContext ac, String callername)
-            throws InvalidParamException {
-        // TODO do our best...
-        if (false/*!isStrictlyPositive()*/) {
-            throw new InvalidParamException("strictly-positive",
-                    toString(), callername, ac);
-        }
-    }
-
-    /**
-     * check if the value is an integer
-     *
-     * @param ac         the validation context
-     * @param callername the property the value is defined in
-     * @throws InvalidParamException
-     */
-    public void checkInteger(ApplContext ac, String callername)
-            throws InvalidParamException {
-        // TODO do our best...
-        if (false/*!isInteger()*/) {
-            throw new InvalidParamException("integer",
-                    toString(), callername, ac);
-        }
-    }
-
-    /**
-     * warn if the value is not positive or null
-     *
-     * @param ac         the validation context
-     * @param callername the property the value is defined in
-     */
-    public boolean warnPositiveness(ApplContext ac, String callername) {
-        // TODO do our best...
-        if (false/*!isPositive()*/) {
-            ac.getFrame().addWarning("negative", toString());
-            return false;
-        }
-        return true;
-    }
-
-    public CssLength getLength() throws InvalidParamException {
-        if (computed_type == CssTypes.CSS_LENGTH) {
-            for (CssValue v : values) {
-                if (v.getType() == CssTypes.CSS_LENGTH) {
-                    return v.getLength();
-                }
-            }
-        }
-        throw new ClassCastException("unknown");
-    }
-
-    public CssPercentage getPercentage() throws InvalidParamException {
-        if (computed_type == CssTypes.CSS_PERCENTAGE) {
-            for (CssValue v : values) {
-                if (v.getType() == CssTypes.CSS_PERCENTAGE) {
-                    return v.getPercentage();
-                }
-            }
-        }
-        throw new ClassCastException("unknown");
-    }
-
-    public CssNumber getNumber() throws InvalidParamException {
-        if (computed_type == CssTypes.CSS_NUMBER) {
-            for (CssValue v : values) {
-                if (v.getType() == CssTypes.CSS_NUMBER) {
-                    return v.getNumber();
-                }
-            }
-        }
-        throw new ClassCastException("unknown");
-    }
-
-    public CssTime getTime() throws InvalidParamException {
-        if (computed_type == CssTypes.CSS_TIME) {
-            for (CssValue v : values) {
-                if (v.getType() == CssTypes.CSS_TIME) {
-                    return v.getTime();
-                }
-            }
-        }
-        throw new ClassCastException("unknown");
-    }
-
-    public CssAngle getAngle() throws InvalidParamException {
-        if (computed_type == CssTypes.CSS_ANGLE) {
-            for (CssValue v : values) {
-                if (v.getType() == CssTypes.CSS_ANGLE) {
-                    return v.getAngle();
-                }
-            }
-        }
-        throw new ClassCastException("unknown");
-    }
-
-    public CssFrequency getFrequency() throws InvalidParamException {
-        if (computed_type == CssTypes.CSS_FREQUENCY) {
-            for (CssValue v : values) {
-                if (v.getType() == CssTypes.CSS_FREQUENCY) {
-                    return v.getFrequency();
-                }
-            }
-        }
-        throw new ClassCastException("unknown");
-    }
-
-    /**
-     * check if the value is equal to zero
-     *
-     * @param ac         the validation context
-     * @param callername the property the value is defined in
-     * @throws InvalidParamException
-     */
-    public void checkEqualsZero(ApplContext ac, String callername)
-            throws InvalidParamException {
-        // we can't check so we only warn.
-        // TODO should we do that only for CSS_NUMBER type?
-        warnEqualsZero(ac, callername);
-    }
-
-    /**
-     * warn if the value is not zero
-     *
-     * @param ac         the validation context
-     * @param callername the property the value is defined in
-     */
-    public boolean warnEqualsZero(ApplContext ac, String callername) {
-        // TODO should we do that only for CSS_NUMBER type?
-        if (!isZero()) {
-            ac.getFrame().addWarning("dynamic", toString());
-            return false;
-        }
-        return true;
-    }
-}
diff --git a/org/w3c/css/values/CssColor.java b/org/w3c/css/values/CssColor.java
index 11abdef75..6ec838737 100644
--- a/org/w3c/css/values/CssColor.java
+++ b/org/w3c/css/values/CssColor.java
@@ -36,6 +36,7 @@ public final int getType() {
     LAB lab = null;
     LCH lch = null;
     DeviceCMYK cmyk = null;
+    LightDark lightdark = null;
 
     boolean contains_variable = false;
 
@@ -114,6 +115,24 @@ public String toString() {
         return "*invalid*";
     }
 
+    public void setLightDark(ApplContext ac, CssExpression exp)
+            throws InvalidParamException {
+        if ((exp == null) || (exp.getCount() != 2)) {
+              throw new InvalidParamException("invalid-color", ac);
+        }
+        LightDark ld = new LightDark();
+        CssValue l = exp.getValue();
+        char op = exp.getOperator();
+        if (l == null || op != COMMA) {
+            throw new InvalidParamException("invalid-color", ac);
+        }
+        exp.next();
+        CssValue d = exp.getValue();
+        ld.setLight(ac, l);
+        ld.setDark(ac, d);
+        this.lightdark = ld;
+        exp.next();
+    }
 
     public void setRGBColor(ApplContext ac, CssExpression exp)
             throws InvalidParamException {
@@ -439,6 +458,21 @@ public void setHSLColor(ApplContext ac, CssExpression exp)
 
         if (exp.hasCssVariable()) {
             markCssVariable();
+            if (exp.getCount() < 3) {
+                // check if we can expand
+                while (!exp.end()) {
+                    val = exp.getValue();
+                    if (val.getRawType() == CssTypes.CSS_VARIABLE) {
+                        CssExpression varexp = ((CssVariable) val).getVariableExpression();
+                        if ((varexp != null) && (varexp.getCount() > 1)) {
+                            // TODO something fancy, merging expression
+                            return;
+                        }
+                    }
+                    exp.next();
+                }
+                return;
+            }
         }
 
         if (val == null || (!separator_space && (op != COMMA))) {
@@ -1016,6 +1050,7 @@ public void setLABColor(ApplContext ac, CssExpression exp)
             throw new InvalidParamException("colorfunc", exp, "Lab", ac);
         }
         switch (val.getType()) {
+            case CssTypes.CSS_NUMBER:
             case CssTypes.CSS_PERCENTAGE:
             case CssTypes.CSS_VARIABLE:
                 lab.setL(ac, val);
@@ -1379,5 +1414,20 @@ public void setDeviceCMYKColor(ApplContext ac, CssExpression exp)
         }
     }
 
+    /**
+     * Parse a LightDark color.
+     * format: light-dark( , ) [ /  ]? ) |
+     */
+    public void setLightDarkColor(ApplContext ac, CssExpression exp)
+            throws InvalidParamException {
+        // light-dark defined in CSS3 and onward
+        if (ac.getCssVersion().compareTo(CssVersion.CSS3) < 0) {
+            StringBuilder sb = new StringBuilder();
+            sb.append("light-dark(").append(exp.toStringFromStart()).append(')');
+            throw new InvalidParamException("notversion", sb.toString(),
+                    ac.getCssVersionString(), ac);
+        }
+        lightdark = new LightDark();
+    }
 }
 
diff --git a/org/w3c/css/values/CssImage.java b/org/w3c/css/values/CssImage.java
index 038299601..b0c6f68b5 100644
--- a/org/w3c/css/values/CssImage.java
+++ b/org/w3c/css/values/CssImage.java
@@ -36,6 +36,7 @@ public final int getType() {
     static final CssIdent ellipse = CssIdent.getIdent("ellipse");
     static final CssIdent from = CssIdent.getIdent("from");
     static final CssIdent[] extent_keywords;
+    static final CssIdent[] image_tags;
 
     static {
         String _val[] = {"closest-corner", "closest-side",
@@ -45,6 +46,12 @@ public final int getType() {
         for (String s : _val) {
             extent_keywords[i++] = CssIdent.getIdent(s);
         }
+        String _img_tags[] = { "ltr", "rtl"};
+        image_tags = new CssIdent[_img_tags.length];
+        i = 0;
+        for (String s: _img_tags) {
+            image_tags[i++] = CssIdent.getIdent(s);
+        }
     }
 
     boolean contains_variable = false;
@@ -86,6 +93,15 @@ public static CssIdent getExtentIdent(CssIdent ident) {
         return null;
     }
 
+    public static CssIdent getImageTag(CssIdent ident)  {
+        for (CssIdent id : image_tags) {
+            if (id.equals(ident)) {
+                return id;
+            }
+        }
+        return null;
+    }
+
     public static CssIdent getShape(CssIdent ident) {
         if (circle.equals(ident)) {
             return circle;
diff --git a/org/w3c/css/values/CssMathFunction.java b/org/w3c/css/values/CssMathFunction.java
new file mode 100644
index 000000000..a27a771a0
--- /dev/null
+++ b/org/w3c/css/values/CssMathFunction.java
@@ -0,0 +1,790 @@
+//
+// @author Yves Lafon 
+//
+// (c) COPYRIGHT MIT, ERCIM, Keio, Beihang, 2020.
+// Please first read the full copyright statement in file COPYRIGHT.html
+
+package org.w3c.css.values;
+
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Locale;
+
+/**
+ * CSS mathfunction().
+ *
+ * @spec https://www.w3.org/TR/2019/WD-css-values-4-20190131/#funcdef-max
+ */
+public class CssMathFunction extends CssCheckableValue {
+
+    public static final int type = CssTypes.CSS_MATH_FUNCTION;
+
+    public final int getRawType() {
+        return type;
+    }
+
+    public final int getType() {
+        if (computed_type == CssTypes.CSS_MATH_FUNCTION) {
+            return type;
+        }
+        return computed_type;
+    }
+
+    public static final CssIdent[] rounding_values;
+
+    static {
+        String[] _allowed_rounding_values = {"nearest", "up", "down",
+                "to-zero"};
+        int i = 0;
+        rounding_values = new CssIdent[_allowed_rounding_values.length];
+        for (String s : _allowed_rounding_values) {
+            rounding_values[i++] = CssIdent.getIdent(s);
+        }
+    }
+
+    public static final boolean isAllowedRounding(CssIdent ident) {
+        for (CssIdent id : rounding_values) {
+            if (id.equals(ident)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    ApplContext ac;
+    int computed_type = CssTypes.CSS_UNKNOWN;
+    ArrayList values = null;
+    String prefix = null;
+    String _toString = null;
+
+
+    /**
+     * Create a new CssCalc
+     */
+    public CssMathFunction(String prefix) {
+        this.prefix = prefix.toLowerCase(Locale.ENGLISH);
+    }
+
+    public CssMathFunction(ApplContext ac, String prefix) {
+        this(ac, prefix, null);
+    }
+
+    public CssMathFunction(String prefix, CssValue value) {
+        this(null, prefix, value);
+    }
+
+    public CssMathFunction(ApplContext ac, String prefix, CssValue value) {
+        if (ac != null) {
+            this.ac = ac;
+        }
+        if (prefix != null) {
+            this.prefix = prefix.toLowerCase(Locale.ENGLISH);
+        }
+        if (value != null) {
+            computed_type = value.getType();
+            if (values == null) {
+                values = new ArrayList<>();
+            }
+            values.add(value);
+            try {
+                computed_type = _checkAcceptableType(value.getType());
+            } catch (Exception ex) { // todo report error here or wait ?
+            }
+        }
+    }
+
+    public void set(String s, ApplContext ac) throws InvalidParamException {
+        // we don't support this way of setting the value
+        // as we rely on the parsing to create it incrementally
+        throw new InvalidParamException("unrecognize", s, ac);
+    }
+
+    public void setValue(BigDecimal d) {
+        // we don't support this way of setting the value
+        // as we rely on the parsing to create it incrementally
+    }
+
+    /**
+     * Add one operand, if we already got one we will... Add one operand.
+     *
+     * @param value
+     * @return
+     */
+    public CssMathFunction addValue(CssValue value)
+            throws InvalidParamException {
+        boolean first = false;
+        if (values == null) {
+            values = new ArrayList<>();
+            first = true;
+        }
+        values.add(value);
+        _computeResultingType(false);
+        return this;
+    }
+
+    public void validate() throws InvalidParamException {
+        _computeResultingType(true);
+    }
+
+    private int _checkAcceptableType(int type)
+            throws InvalidParamException {
+        //  , , , , , or 
+        if (type != CssTypes.CSS_PERCENTAGE &&
+                type != CssTypes.CSS_LENGTH &&
+                type != CssTypes.CSS_NUMBER &&
+                type != CssTypes.CSS_ANGLE &&
+                type != CssTypes.CSS_FREQUENCY &&
+                type != CssTypes.CSS_TIME) {
+            throw new InvalidParamException("invalidtype", toStringUnprefixed(), ac);
+        }
+        return type;
+    }
+
+    private void _computeResultingType(boolean is_final)
+            throws InvalidParamException {
+        switch (prefix) {
+            case "clamp(":
+            case "min(":
+            case "max(":
+            case "hypot(":
+                _computeResultingTypeList(is_final);
+                break;
+            case "sin(":
+            case "cos(":
+            case "tan(":
+            case "asin(":
+            case "acos(":
+            case "atan(":
+                if (is_final) {
+                    _computeResultingTypeTrig(is_final);
+                }
+                break;
+            case "exp(":
+            case "sqrt(":
+                _computeResultingTypeOneNum(is_final);
+                break;
+            case "pow(":
+                if (is_final) {
+                    _computeResultingTypeTwoNum(is_final);
+                }
+                break;
+            case "log(":
+                if (is_final) {
+                    _computeResultingTypeTwoNumOpt(is_final);
+                }
+                break;
+            case "mod(":
+            case "rem(":
+                if (is_final) {
+                    _computeResultingTypeTwoAny(is_final);
+                }
+                break;
+            case "abs(":
+                _computeResultingTypeOneAny(is_final);
+                break;
+            case "atan2(":
+                if (is_final) {
+                    _computeResultingTypeAtan2(is_final);
+                }
+                break;
+            case "sign(":
+                if (is_final) {
+                    _computeResultingTypeSign(is_final);
+                }
+                break;
+            case "round(":
+                if (is_final) {
+                    _computeResultingTypeRound(is_final);
+                }
+                break;
+            default:
+                throw new InvalidParamException("unrecognize", ac);
+        }
+
+    }
+
+    private void _computeResultingTypeOneNum(boolean is_final)
+            throws InvalidParamException {
+        int valtype;
+        if (values.size() > 1) {
+            throw new InvalidParamException("unrecognize", ac);
+        }
+        valtype = values.get(0).getType();
+        if (valtype == CssTypes.CSS_NUMBER) {
+            computed_type = CssTypes.CSS_NUMBER;
+        } else if (valtype == CssTypes.CSS_VARIABLE) {
+            markCssVariable();
+            computed_type = valtype;
+        } else {
+            throw new InvalidParamException("incompatibletypes", toString(), ac);
+        }
+    }
+
+    private void _computeResultingTypeTwoNum(boolean is_final)
+            throws InvalidParamException {
+        int valtype1, valtype2;
+        if (values.size() != 2) {
+            throw new InvalidParamException("unrecognize", ac);
+        }
+        valtype1 = values.get(0).getType();
+        valtype2 = values.get(1).getType();
+        if ((valtype1 == CssTypes.CSS_NUMBER) && (valtype2 == CssTypes.CSS_NUMBER)) {
+            computed_type = CssTypes.CSS_NUMBER;
+        } else if ((valtype1 == CssTypes.CSS_VARIABLE) || (valtype2 == CssTypes.CSS_VARIABLE)) {
+            if (valtype1 == CssTypes.CSS_VARIABLE) {
+                if ((valtype2 == CssTypes.CSS_NUMBER) || (valtype2 == CssTypes.CSS_VARIABLE)) {
+                    computed_type = valtype2;
+                } else {
+                    // one type is not NUMBER
+                    throw new InvalidParamException("incompatibletypes", toString(), ac);
+                }
+            } else if (valtype1 == CssTypes.CSS_NUMBER) {
+                computed_type = valtype1;
+            } else {
+                throw new InvalidParamException("incompatibletypes", toString(), ac);
+            }
+        } else {
+            throw new InvalidParamException("incompatibletypes", toString(), ac);
+        }
+    }
+
+    // used for log(A, B?)
+    private void _computeResultingTypeTwoNumOpt(boolean is_final)
+            throws InvalidParamException {
+        int valtype;
+        if (values.size() > 2) {
+            throw new InvalidParamException("unrecognize", ac);
+        }
+        valtype = values.get(0).getType();
+        if (valtype == CssTypes.CSS_NUMBER) {
+            computed_type = valtype;
+        } else {
+            if (valtype == CssTypes.CSS_VARIABLE) {
+                markCssVariable();
+                computed_type = CssTypes.CSS_VARIABLE;
+            } else {
+                throw new InvalidParamException("incompatibletypes", toString(), ac);
+            }
+        }
+        if (values.size() > 1) {
+            valtype = values.get(1).getType();
+            // computed type is set, just verify that it matches
+            if (valtype != CssTypes.CSS_NUMBER) {
+                if (valtype == CssTypes.CSS_VARIABLE) {
+                    if (computed_type != valtype) {
+                        markCssVariable();
+                    }
+                } else {
+                    throw new InvalidParamException("incompatibletypes", toString(), ac);
+                }
+            }
+        }
+    }
+
+    private void _computeResultingTypeAtan2(boolean is_final)
+            throws InvalidParamException {
+        int valtype1, valtype2;
+        if (values.size() != 2) {
+            throw new InvalidParamException("unrecognize", ac);
+        }
+        valtype1 = values.get(0).getType();
+        valtype2 = values.get(1).getType();
+        if ((valtype1 == CssTypes.CSS_VARIABLE) || (valtype2 == CssTypes.CSS_VARIABLE)) {
+            markCssVariable();
+            if (valtype1 != CssTypes.CSS_VARIABLE) {
+                if (valtype1 != CssTypes.CSS_PERCENTAGE &&
+                        valtype1 != CssTypes.CSS_LENGTH &&
+                        valtype1 != CssTypes.CSS_NUMBER) {
+                    throw new InvalidParamException("incompatibletypes", toString(), ac);
+                }
+            } else if (valtype2 != CssTypes.CSS_VARIABLE) {
+                if (valtype2 != CssTypes.CSS_PERCENTAGE &&
+                        valtype2 != CssTypes.CSS_LENGTH &&
+                        valtype2 != CssTypes.CSS_NUMBER) {
+                    throw new InvalidParamException("incompatibletypes", toString(), ac);
+                }
+            } else {
+                // both are variables.
+                computed_type = valtype1;
+            }
+            computed_type = CssTypes.CSS_ANGLE;
+            return;
+        }
+        if (valtype1 != CssTypes.CSS_PERCENTAGE &&
+                valtype1 != CssTypes.CSS_LENGTH &&
+                valtype1 != CssTypes.CSS_NUMBER) {
+            throw new InvalidParamException("incompatibletypes", toString(), ac);
+        }
+        if (valtype1 == valtype2) {
+            computed_type = CssTypes.CSS_ANGLE;
+        } else {
+            throw new InvalidParamException("incompatibletypes", toString(), ac);
+        }
+    }
+
+    private void _computeResultingTypeRound(boolean is_final)
+            throws InvalidParamException {
+        int valtype1, valtype2;
+        int vsize = values.size();
+        if ((vsize < 2) || (vsize > 3)) {
+            throw new InvalidParamException("unrecognize", ac);
+        }
+        if (vsize == 2) {
+            valtype1 = values.get(0).getType();
+            // parsing artefact
+            if (valtype1 == CssTypes.CSS_IDENT) {
+                try {
+                    CssNumber n = new CssNumber();
+                    n.set(values.get(0).getIdent().toString(), ac);
+                    valtype1 = CssTypes.CSS_NUMBER;
+                } catch (Exception ignored) {
+                }
+            } else if (valtype1 == CssTypes.CSS_VARIABLE) {
+                markCssVariable();
+                valtype2 = values.get(1).getType();
+                if (valtype2 == CssTypes.CSS_VARIABLE) {
+                    computed_type = valtype1;
+                    return;
+                } else {
+                    if (valtype2 != CssTypes.CSS_PERCENTAGE &&
+                            valtype2 != CssTypes.CSS_LENGTH &&
+                            valtype2 != CssTypes.CSS_NUMBER) {
+                        throw new InvalidParamException("incompatibletypes", toString(), ac);
+                    }
+                    computed_type = valtype2;
+                    return;
+                }
+            } else if (valtype1 != CssTypes.CSS_PERCENTAGE &&
+                    valtype1 != CssTypes.CSS_LENGTH &&
+                    valtype1 != CssTypes.CSS_NUMBER) {
+                throw new InvalidParamException("incompatibletypes", toString(), ac);
+            }
+            valtype2 = values.get(1).getType();
+        } else {  // 3 values
+            CssValue v = values.get(0);
+            // FIXME TODO need to care about rounding type being an unresolved var() ?
+            if (v.getType() != CssTypes.CSS_IDENT) {
+                throw new InvalidParamException("incompatibletypes", toString(), ac);
+            }
+            if (!isAllowedRounding(v.getIdent())) {
+                throw new InvalidParamException("incompatibletypes", toString(), ac);
+            }
+            valtype1 = values.get(1).getType();
+            valtype2 = values.get(2).getType();
+        }
+        if (valtype1 == CssTypes.CSS_VARIABLE) {
+            markCssVariable();
+            if (valtype2 == CssTypes.CSS_VARIABLE) {
+                computed_type = valtype1;
+                return;
+            } else {
+                if (valtype2 != CssTypes.CSS_PERCENTAGE &&
+                        valtype2 != CssTypes.CSS_LENGTH &&
+                        valtype2 != CssTypes.CSS_NUMBER) {
+                    throw new InvalidParamException("incompatibletypes", toString(), ac);
+                }
+                computed_type = valtype2;
+                return;
+            }
+        } else if (valtype2 == CssTypes.CSS_VARIABLE) {
+            markCssVariable();
+            if (valtype1 != CssTypes.CSS_PERCENTAGE &&
+                    valtype1 != CssTypes.CSS_LENGTH &&
+                    valtype1 != CssTypes.CSS_NUMBER) {
+                throw new InvalidParamException("incompatibletypes", toString(), ac);
+            }
+            computed_type = valtype1;
+            return;
+        }
+        if ((valtype1 == valtype2) && (valtype1 == CssTypes.CSS_PERCENTAGE ||
+                valtype1 == CssTypes.CSS_LENGTH ||
+                valtype1 == CssTypes.CSS_NUMBER)) {
+            computed_type = valtype1;
+        } else {
+            throw new InvalidParamException("incompatibletypes", toString(), ac);
+        }
+    }
+
+    private void _computeResultingTypeSign(boolean is_final)
+            throws InvalidParamException {
+        if (values.size() > 1) {
+            throw new InvalidParamException("unrecognize", ac);
+        }
+        if (values.get(0).getType() == CssTypes.CSS_VARIABLE) {
+            markCssVariable();
+        }
+        computed_type = CssTypes.CSS_NUMBER;
+    }
+
+    private void _computeResultingTypeOneAny(boolean is_final)
+            throws InvalidParamException {
+        int valtype;
+        if (values.size() > 1) {
+            throw new InvalidParamException("unrecognize", ac);
+        }
+        valtype = values.get(0).getType();
+        if (valtype == CssTypes.CSS_VARIABLE) {
+            markCssVariable();
+        }
+        computed_type = valtype;
+    }
+
+    private void _computeResultingTypeTwoAny(boolean is_final)
+            throws InvalidParamException {
+        int valtype1, valtype2;
+        if (values.size() != 2) {
+            throw new InvalidParamException("unrecognize", ac);
+        }
+        valtype1 = values.get(0).getType();
+        valtype2 = values.get(1).getType();
+        if ((valtype1 == CssTypes.CSS_VARIABLE) || (valtype2 == CssTypes.CSS_VARIABLE)) {
+            markCssVariable();
+            if (valtype1 != CssTypes.CSS_VARIABLE) {
+                computed_type = valtype1;
+            } else if (valtype2 != CssTypes.CSS_VARIABLE) {
+                computed_type = valtype2;
+            } else {
+                // default to CssVariable
+                computed_type = valtype1;
+            }
+            return;
+        }
+        if (valtype1 == valtype2) {
+            computed_type = valtype1;
+        } else {
+            throw new InvalidParamException("incompatibletypes", toString(), ac);
+        }
+    }
+
+    private void _computeResultingTypeTrig(boolean is_final)
+            throws InvalidParamException {
+        int valtype;
+        if (values.size() > 1) {
+            throw new InvalidParamException("unrecognize", ac);
+        }
+        valtype = values.get(0).getType();
+        if (valtype == CssTypes.CSS_VARIABLE) {
+            markCssVariable();
+            if (prefix.startsWith("a")) {
+                computed_type = CssTypes.CSS_ANGLE;
+            } else {
+                computed_type = CssTypes.CSS_NUMBER;
+            }
+        } else if ((valtype == CssTypes.CSS_NUMBER) || (valtype == CssTypes.CSS_ANGLE)) {
+            // FIXME should check cos(angle | 0) and acos(number) to be more precise
+            if (prefix.startsWith("a")) {
+                computed_type = CssTypes.CSS_ANGLE;
+            } else {
+                computed_type = CssTypes.CSS_NUMBER;
+            }
+        } else {
+            throw new InvalidParamException("incompatibletypes", toString(), ac);
+        }
+    }
+
+    private void _computeResultingTypeList(boolean is_final)
+            throws InvalidParamException {
+        int valtype = CssTypes.CSS_MATH_FUNCTION;
+        boolean firstVal = true;
+        CssValue prevVal = null;
+
+        for (CssValue v : values) {
+            if (firstVal) {
+                valtype = v.getType();
+                // Variable? defer to the next type
+                if (valtype == CssTypes.CSS_VARIABLE) {
+                    markCssVariable();
+                    continue;
+                }
+                _checkAcceptableType(valtype);
+                computed_type = valtype;
+                firstVal = false;
+                prevVal = v;
+            } else {
+                if (valtype == v.getType()) {
+                    prevVal = v;
+                    continue;
+                }
+                if (valtype == CssTypes.CSS_PERCENTAGE) {
+                    valtype = _checkAcceptableType(v.getType());
+                    prevVal = v;
+                    continue;
+                }
+                if (v.getType() == CssTypes.CSS_PERCENTAGE) {
+                    continue;
+                }
+                if (valtype == CssTypes.CSS_NUMBER && prevVal.getNumber().isZero()) {
+                    valtype = _checkAcceptableType(v.getType());
+                    prevVal = v;
+                    continue;
+                }
+                if (v.getType() == CssTypes.CSS_NUMBER && v.getNumber().isZero()) {
+                    continue;
+                }
+                // if it is a variable without a computed type, skip it
+                if ((v.getType() == CssTypes.CSS_VARIABLE) || (v.getRawType() == CssTypes.CSS_VARIABLE)) {
+                    markCssVariable();
+                    continue;
+                }
+                throw new InvalidParamException("incompatibletypes", toStringUnprefixed(), ac);
+            }
+        }
+        computed_type = valtype;
+    }
+
+    /**
+     * Returns the value
+     */
+
+    public Object get() {
+        return toString();
+    }
+
+    protected String toStringUnprefixed() {
+        StringBuilder sb = new StringBuilder();
+        boolean isFirst = true;
+        for (CssValue v : values) {
+            if (!isFirst) {
+                sb.append(", ");
+            } else {
+                isFirst = false;
+            }
+            sb.append(v);
+        }
+        return sb.toString();
+    }
+
+    public String toString() {
+        if (_toString == null) {
+            StringBuilder sb = new StringBuilder();
+            sb.append(prefix).append(toStringUnprefixed()).append(')');
+            _toString = sb.toString();
+        }
+        return _toString;
+    }
+
+
+    public boolean isInteger() {
+        return false;
+    }
+
+    /**
+     * Returns true is the value is positive of null
+     *
+     * @return a boolean
+     */
+    public boolean isPositive() {
+        // TODO do our best...
+        return false;
+    }
+
+    /**
+     * Returns true is the value is positive of null
+     *
+     * @return a boolean
+     */
+    public boolean isStrictlyPositive() {
+        return false;
+        // TODO do our best...
+    }
+
+    /**
+     * Returns true is the value is zero
+     *
+     * @return a boolean
+     */
+    public boolean isZero() {
+        // TODO do our best...
+        return false;
+    }
+
+
+    /**
+     * Compares two values for equality.
+     *
+     * @param value The other value.
+     */
+    public boolean equals(Object value) {
+        if (!(value instanceof CssMathFunction)) {
+            return false;
+        }
+        CssMathFunction other = (CssMathFunction) value;
+        boolean match;
+        // this is inherently wrong, as we should check only the min value, but in that case we
+        // would need to explicitly compute them which is not done.
+        for (CssValue v : this.values) {
+            match = false;
+            for (CssValue ov : other.values) {
+                if (v.equals(ov)) {
+                    match = true;
+                    break;
+                }
+            }
+            if (!match) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * check if the value is positive or null
+     *
+     * @param ac         the validation context
+     * @param callername the property the value is defined in
+     * @throws InvalidParamException
+     */
+    public void checkPositiveness(ApplContext ac, String callername)
+            throws InvalidParamException {
+        // TODO do our best...
+        if (false /*!isPositive()*/) {
+            throw new InvalidParamException("negative-value",
+                    toString(), callername, ac);
+        }
+    }
+
+    /**
+     * check if the value is strictly positive
+     *
+     * @param ac         the validation context
+     * @param callername the property the value is defined in
+     * @throws InvalidParamException
+     */
+    public void checkStrictPositiveness(ApplContext ac, String callername)
+            throws InvalidParamException {
+        // TODO do our best...
+        if (false/*!isStrictlyPositive()*/) {
+            throw new InvalidParamException("strictly-positive",
+                    toString(), callername, ac);
+        }
+    }
+
+    /**
+     * check if the value is an integer
+     *
+     * @param ac         the validation context
+     * @param callername the property the value is defined in
+     * @throws InvalidParamException
+     */
+    public void checkInteger(ApplContext ac, String callername)
+            throws InvalidParamException {
+        // TODO do our best...
+        if (false/*!isInteger()*/) {
+            throw new InvalidParamException("integer",
+                    toString(), callername, ac);
+        }
+    }
+
+    /**
+     * warn if the value is not positive or null
+     *
+     * @param ac         the validation context
+     * @param callername the property the value is defined in
+     */
+    public boolean warnPositiveness(ApplContext ac, String callername) {
+        // TODO do our best...
+        if (false/*!isPositive()*/) {
+            ac.getFrame().addWarning("negative", toString());
+            return false;
+        }
+        return true;
+    }
+
+    public CssLength getLength() throws InvalidParamException {
+        if (computed_type == CssTypes.CSS_LENGTH) {
+            for (CssValue v : values) {
+                if (v.getType() == CssTypes.CSS_LENGTH) {
+                    return v.getLength();
+                }
+            }
+        }
+        throw new ClassCastException("unknown");
+    }
+
+    public CssPercentage getPercentage() throws InvalidParamException {
+        if (computed_type == CssTypes.CSS_PERCENTAGE) {
+            for (CssValue v : values) {
+                if (v.getType() == CssTypes.CSS_PERCENTAGE) {
+                    return v.getPercentage();
+                }
+            }
+        }
+        throw new ClassCastException("unknown");
+    }
+
+    public CssNumber getNumber() throws InvalidParamException {
+        if (computed_type == CssTypes.CSS_NUMBER) {
+            for (CssValue v : values) {
+                if (v.getType() == CssTypes.CSS_NUMBER) {
+                    return v.getNumber();
+                }
+            }
+        }
+        throw new ClassCastException("unknown");
+    }
+
+    public CssTime getTime() throws InvalidParamException {
+        if (computed_type == CssTypes.CSS_TIME) {
+            for (CssValue v : values) {
+                if (v.getType() == CssTypes.CSS_TIME) {
+                    return v.getTime();
+                }
+            }
+        }
+        throw new ClassCastException("unknown");
+    }
+
+    public CssAngle getAngle() throws InvalidParamException {
+        if (computed_type == CssTypes.CSS_ANGLE) {
+            for (CssValue v : values) {
+                if (v.getType() == CssTypes.CSS_ANGLE) {
+                    return v.getAngle();
+                }
+            }
+        }
+        throw new ClassCastException("unknown");
+    }
+
+    public CssFrequency getFrequency() throws InvalidParamException {
+        if (computed_type == CssTypes.CSS_FREQUENCY) {
+            for (CssValue v : values) {
+                if (v.getType() == CssTypes.CSS_FREQUENCY) {
+                    return v.getFrequency();
+                }
+            }
+        }
+        throw new ClassCastException("unknown");
+    }
+
+    /**
+     * check if the value is equal to zero
+     *
+     * @param ac         the validation context
+     * @param callername the property the value is defined in
+     * @throws InvalidParamException
+     */
+    public void checkEqualsZero(ApplContext ac, String callername)
+            throws InvalidParamException {
+        // we can't check so we only warn.
+        // TODO should we do that only for CSS_NUMBER type?
+        warnEqualsZero(ac, callername);
+    }
+
+    /**
+     * warn if the value is not zero
+     *
+     * @param ac         the validation context
+     * @param callername the property the value is defined in
+     */
+    public boolean warnEqualsZero(ApplContext ac, String callername) {
+        // TODO should we do that only for CSS_NUMBER type?
+        if (!isZero()) {
+            ac.getFrame().addWarning("dynamic", toString());
+            return false;
+        }
+        return true;
+    }
+}
diff --git a/org/w3c/css/values/CssMax.java b/org/w3c/css/values/CssMax.java
deleted file mode 100644
index 5efb090cf..000000000
--- a/org/w3c/css/values/CssMax.java
+++ /dev/null
@@ -1,411 +0,0 @@
-//
-// @author Yves Lafon 
-//
-// (c) COPYRIGHT MIT, ERCIM, Keio, Beihang, 2020.
-// Please first read the full copyright statement in file COPYRIGHT.html
-
-package org.w3c.css.values;
-
-import org.w3c.css.util.ApplContext;
-import org.w3c.css.util.InvalidParamException;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-
-/**
- * CSS max().
- *
- * @spec https://www.w3.org/TR/2019/WD-css-values-4-20190131/#funcdef-max
- */
-public class CssMax extends CssCheckableValue {
-
-    public static final int type = CssTypes.CSS_MAX;
-
-    public final int getRawType() {
-        return type;
-    }
-
-    public final int getType() {
-        if (computed_type == CssTypes.CSS_MAX) {
-            return type;
-        }
-        return computed_type;
-    }
-
-    ApplContext ac;
-    int computed_type = CssTypes.CSS_UNKNOWN;
-    ArrayList values = null;
-    String _toString = null;
-
-
-    /**
-     * Create a new CssCalc
-     */
-    public CssMax() {
-    }
-
-    public CssMax(ApplContext ac) {
-        this(ac, null);
-    }
-
-    public CssMax(CssValue value) {
-        this(null, value);
-    }
-
-    public CssMax(ApplContext ac, CssValue value) {
-        if (ac != null) {
-            this.ac = ac;
-        }
-        if (value != null) {
-            computed_type = value.getType();
-            if (values == null) {
-                values = new ArrayList<>();
-            }
-            values.add(value);
-            try {
-                computed_type = _checkAcceptableType(value.getType());
-            } catch (Exception ex) { // todo report error here or wait ?
-            }
-        }
-    }
-
-    public void set(String s, ApplContext ac) throws InvalidParamException {
-        // we don't support this way of setting the value
-        // as we rely on the parsing to create it incrementally
-        throw new InvalidParamException("unrecognize", s, ac);
-    }
-
-    public void setValue(BigDecimal d) {
-        // we don't support this way of setting the value
-        // as we rely on the parsing to create it incrementally
-    }
-
-    /**
-     * Add one operand, if we already got one we will... Add one operand.
-     *
-     * @param value
-     * @return
-     */
-    public CssMax addValue(CssValue value)
-            throws InvalidParamException {
-        boolean first = false;
-        if (values == null) {
-            values = new ArrayList<>();
-            first = true;
-        }
-        values.add(value);
-        _computeResultingType(false);
-        return this;
-    }
-
-    public void validate() throws InvalidParamException {
-        _computeResultingType(true);
-    }
-
-    private int _checkAcceptableType(int type)
-            throws InvalidParamException {
-        //  , , , , , or 
-        if (type != CssTypes.CSS_PERCENTAGE &&
-                type != CssTypes.CSS_LENGTH &&
-                type != CssTypes.CSS_NUMBER &&
-                type != CssTypes.CSS_ANGLE &&
-                type != CssTypes.CSS_FREQUENCY &&
-                type != CssTypes.CSS_TIME) {
-            throw new InvalidParamException("invalidtype", toStringUnprefixed(), ac);
-        }
-        return type;
-    }
-
-    private void _computeResultingType(boolean first)
-            throws InvalidParamException {
-        int valtype = CssTypes.CSS_MAX;
-        boolean firstVal = true;
-        CssValue prevVal = null;
-
-        for (CssValue v : values) {
-            if (firstVal) {
-                valtype = v.getType();
-                _checkAcceptableType(valtype);
-                computed_type = valtype;
-                firstVal = false;
-                prevVal = v;
-            } else {
-                if (valtype == v.getType()) {
-                    prevVal = v;
-                    continue;
-                }
-                if (valtype == CssTypes.CSS_PERCENTAGE) {
-                    valtype = _checkAcceptableType(v.getType());
-                    prevVal = v;
-                    continue;
-                }
-                if (v.getType() == CssTypes.CSS_PERCENTAGE) {
-                    continue;
-                }
-                if (valtype == CssTypes.CSS_NUMBER && prevVal.getNumber().isZero()) {
-                    valtype = _checkAcceptableType(v.getType());
-                    prevVal = v;
-                    continue;
-                }
-                if (v.getType() == CssTypes.CSS_NUMBER && v.getNumber().isZero()) {
-                    continue;
-                }
-                throw new InvalidParamException("incompatibletypes", toStringUnprefixed(), ac);
-            }
-        }
-        computed_type = valtype;
-    }
-
-    /**
-     * Returns the value
-     */
-
-    public Object get() {
-        return toString();
-    }
-
-    protected String toStringUnprefixed() {
-        StringBuilder sb = new StringBuilder();
-        boolean isFirst = true;
-        for (CssValue v : values) {
-            if (!isFirst) {
-                sb.append(", ");
-            } else {
-                isFirst = false;
-            }
-            sb.append(v);
-        }
-        return sb.toString();
-    }
-
-    public String toString() {
-        if (_toString == null) {
-            StringBuilder sb = new StringBuilder();
-            sb.append("max(").append(toStringUnprefixed()).append(')');
-            _toString = sb.toString();
-        }
-        return _toString;
-    }
-
-
-    public boolean isInteger() {
-        return false;
-    }
-
-    /**
-     * Returns true is the value is positive of null
-     *
-     * @return a boolean
-     */
-    public boolean isPositive() {
-        // TODO do our best...
-        return false;
-    }
-
-    /**
-     * Returns true is the value is positive of null
-     *
-     * @return a boolean
-     */
-    public boolean isStrictlyPositive() {
-        return false;
-        // TODO do our best...
-    }
-
-    /**
-     * Returns true is the value is zero
-     *
-     * @return a boolean
-     */
-    public boolean isZero() {
-        // TODO do our best...
-        return false;
-    }
-
-
-    /**
-     * Compares two values for equality.
-     *
-     * @param value The other value.
-     */
-    public boolean equals(Object value) {
-        if (!(value instanceof CssMax)) {
-            return false;
-        }
-        CssMax other = (CssMax) value;
-        boolean match;
-        // this is inherently wrong, as we should check only the min value, but in that case we
-        // would need to explicitly compute them which is not done.
-        for (CssValue v : this.values) {
-            match = false;
-            for (CssValue ov : other.values) {
-                if (v.equals(ov)) {
-                    match = true;
-                    break;
-                }
-            }
-            if (!match) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * check if the value is positive or null
-     *
-     * @param ac         the validation context
-     * @param callername the property the value is defined in
-     * @throws InvalidParamException
-     */
-    public void checkPositiveness(ApplContext ac, String callername)
-            throws InvalidParamException {
-        // TODO do our best...
-        if (false /*!isPositive()*/) {
-            throw new InvalidParamException("negative-value",
-                    toString(), callername, ac);
-        }
-    }
-
-    /**
-     * check if the value is strictly positive
-     *
-     * @param ac         the validation context
-     * @param callername the property the value is defined in
-     * @throws InvalidParamException
-     */
-    public void checkStrictPositiveness(ApplContext ac, String callername)
-            throws InvalidParamException {
-        // TODO do our best...
-        if (false/*!isStrictlyPositive()*/) {
-            throw new InvalidParamException("strictly-positive",
-                    toString(), callername, ac);
-        }
-    }
-
-    /**
-     * check if the value is an integer
-     *
-     * @param ac         the validation context
-     * @param callername the property the value is defined in
-     * @throws InvalidParamException
-     */
-    public void checkInteger(ApplContext ac, String callername)
-            throws InvalidParamException {
-        // TODO do our best...
-        if (false/*!isInteger()*/) {
-            throw new InvalidParamException("integer",
-                    toString(), callername, ac);
-        }
-    }
-
-    /**
-     * warn if the value is not positive or null
-     *
-     * @param ac         the validation context
-     * @param callername the property the value is defined in
-     */
-    public boolean warnPositiveness(ApplContext ac, String callername) {
-        // TODO do our best...
-        if (false/*!isPositive()*/) {
-            ac.getFrame().addWarning("negative", toString());
-            return false;
-        }
-        return true;
-    }
-
-    public CssLength getLength() throws InvalidParamException {
-        if (computed_type == CssTypes.CSS_LENGTH) {
-            for (CssValue v : values) {
-                if (v.getType() == CssTypes.CSS_LENGTH) {
-                    return v.getLength();
-                }
-            }
-        }
-        throw new ClassCastException("unknown");
-    }
-
-    public CssPercentage getPercentage() throws InvalidParamException {
-        if (computed_type == CssTypes.CSS_PERCENTAGE) {
-            for (CssValue v : values) {
-                if (v.getType() == CssTypes.CSS_PERCENTAGE) {
-                    return v.getPercentage();
-                }
-            }
-        }
-        throw new ClassCastException("unknown");
-    }
-
-    public CssNumber getNumber() throws InvalidParamException {
-        if (computed_type == CssTypes.CSS_NUMBER) {
-            for (CssValue v : values) {
-                if (v.getType() == CssTypes.CSS_NUMBER) {
-                    return v.getNumber();
-                }
-            }
-        }
-        throw new ClassCastException("unknown");
-    }
-
-    public CssTime getTime() throws InvalidParamException {
-        if (computed_type == CssTypes.CSS_TIME) {
-            for (CssValue v : values) {
-                if (v.getType() == CssTypes.CSS_TIME) {
-                    return v.getTime();
-                }
-            }
-        }
-        throw new ClassCastException("unknown");
-    }
-
-    public CssAngle getAngle() throws InvalidParamException {
-        if (computed_type == CssTypes.CSS_ANGLE) {
-            for (CssValue v : values) {
-                if (v.getType() == CssTypes.CSS_ANGLE) {
-                    return v.getAngle();
-                }
-            }
-        }
-        throw new ClassCastException("unknown");
-    }
-
-    public CssFrequency getFrequency() throws InvalidParamException {
-        if (computed_type == CssTypes.CSS_FREQUENCY) {
-            for (CssValue v : values) {
-                if (v.getType() == CssTypes.CSS_FREQUENCY) {
-                    return v.getFrequency();
-                }
-            }
-        }
-        throw new ClassCastException("unknown");
-    }
-
-    /**
-     * check if the value is equal to zero
-     *
-     * @param ac         the validation context
-     * @param callername the property the value is defined in
-     * @throws InvalidParamException
-     */
-    public void checkEqualsZero(ApplContext ac, String callername)
-            throws InvalidParamException {
-        // we can't check so we only warn.
-        // TODO should we do that only for CSS_NUMBER type?
-        warnEqualsZero(ac, callername);
-    }
-
-    /**
-     * warn if the value is not zero
-     *
-     * @param ac         the validation context
-     * @param callername the property the value is defined in
-     */
-    public boolean warnEqualsZero(ApplContext ac, String callername) {
-        // TODO should we do that only for CSS_NUMBER type?
-        if (!isZero()) {
-            ac.getFrame().addWarning("dynamic", toString());
-            return false;
-        }
-        return true;
-    }
-}
diff --git a/org/w3c/css/values/CssMin.java b/org/w3c/css/values/CssMin.java
deleted file mode 100644
index 692e8b623..000000000
--- a/org/w3c/css/values/CssMin.java
+++ /dev/null
@@ -1,411 +0,0 @@
-//
-// @author Yves Lafon 
-//
-// (c) COPYRIGHT MIT, ERCIM, Keio, Beihang, 2020.
-// Please first read the full copyright statement in file COPYRIGHT.html
-
-package org.w3c.css.values;
-
-import org.w3c.css.util.ApplContext;
-import org.w3c.css.util.InvalidParamException;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-
-/**
- * CSS min().
- *
- * @spec https://www.w3.org/TR/2019/WD-css-values-4-20190131/#funcdef-min
- */
-public class CssMin extends CssCheckableValue {
-
-    public static final int type = CssTypes.CSS_MIN;
-
-    public final int getRawType() {
-        return type;
-    }
-
-    public final int getType() {
-        if (computed_type == CssTypes.CSS_MIN) {
-            return type;
-        }
-        return computed_type;
-    }
-
-    ApplContext ac;
-    int computed_type = CssTypes.CSS_UNKNOWN;
-    ArrayList values = null;
-    String _toString = null;
-
-
-    /**
-     * Create a new CssCalc
-     */
-    public CssMin() {
-    }
-
-    public CssMin(ApplContext ac) {
-        this(ac, null);
-    }
-
-    public CssMin(CssValue value) {
-        this(null, value);
-    }
-
-    public CssMin(ApplContext ac, CssValue value) {
-        if (ac != null) {
-            this.ac = ac;
-        }
-        if (value != null) {
-            computed_type = value.getType();
-            if (values == null) {
-                values = new ArrayList<>();
-            }
-            values.add(value);
-            try {
-                computed_type = _checkAcceptableType(value.getType());
-            } catch (Exception ex) { // todo report error here or wait ?
-            }
-        }
-    }
-
-    public void set(String s, ApplContext ac) throws InvalidParamException {
-        // we don't support this way of setting the value
-        // as we rely on the parsing to create it incrementally
-        throw new InvalidParamException("unrecognize", s, ac);
-    }
-
-    public void setValue(BigDecimal d) {
-        // we don't support this way of setting the value
-        // as we rely on the parsing to create it incrementally
-    }
-
-    /**
-     * Add one operand, if we already got one we will... Add one operand.
-     *
-     * @param value
-     * @return
-     */
-    public CssMin addValue(CssValue value)
-            throws InvalidParamException {
-        boolean first = false;
-        if (values == null) {
-            values = new ArrayList<>();
-            first = true;
-        }
-        values.add(value);
-        _computeResultingType(false);
-        return this;
-    }
-
-    public void validate() throws InvalidParamException {
-        _computeResultingType(true);
-    }
-
-    private int _checkAcceptableType(int type)
-            throws InvalidParamException {
-        //  , , , , , or 
-        if (type != CssTypes.CSS_PERCENTAGE &&
-                type != CssTypes.CSS_LENGTH &&
-                type != CssTypes.CSS_NUMBER &&
-                type != CssTypes.CSS_ANGLE &&
-                type != CssTypes.CSS_FREQUENCY &&
-                type != CssTypes.CSS_TIME) {
-            throw new InvalidParamException("invalidtype", toStringUnprefixed(), ac);
-        }
-        return type;
-    }
-
-    private void _computeResultingType(boolean first)
-            throws InvalidParamException {
-        int valtype = CssTypes.CSS_MIN;
-        boolean firstVal = true;
-        CssValue prevVal = null;
-
-        for (CssValue v : values) {
-            if (firstVal) {
-                valtype = v.getType();
-                _checkAcceptableType(valtype);
-                computed_type = valtype;
-                firstVal = false;
-                prevVal = v;
-            } else {
-                if (valtype == v.getType()) {
-                    prevVal = v;
-                    continue;
-                }
-                if (valtype == CssTypes.CSS_PERCENTAGE) {
-                    valtype = _checkAcceptableType(v.getType());
-                    prevVal = v;
-                    continue;
-                }
-                if (v.getType() == CssTypes.CSS_PERCENTAGE) {
-                    continue;
-                }
-                if (valtype == CssTypes.CSS_NUMBER && prevVal.getNumber().isZero()) {
-                    valtype = _checkAcceptableType(v.getType());
-                    prevVal = v;
-                    continue;
-                }
-                if (v.getType() == CssTypes.CSS_NUMBER && v.getNumber().isZero()) {
-                    continue;
-                }
-                throw new InvalidParamException("incompatibletypes", toStringUnprefixed(), ac);
-            }
-        }
-        computed_type = valtype;
-    }
-
-    /**
-     * Returns the value
-     */
-
-    public Object get() {
-        return toString();
-    }
-
-    protected String toStringUnprefixed() {
-        StringBuilder sb = new StringBuilder();
-        boolean isFirst = true;
-        for (CssValue v : values) {
-            if (!isFirst) {
-                sb.append(", ");
-            } else {
-                isFirst = false;
-            }
-            sb.append(v);
-        }
-        return sb.toString();
-    }
-
-    public String toString() {
-        if (_toString == null) {
-            StringBuilder sb = new StringBuilder();
-            sb.append("min(").append(toStringUnprefixed()).append(')');
-            _toString = sb.toString();
-        }
-        return _toString;
-    }
-
-
-    public boolean isInteger() {
-        return false;
-    }
-
-    /**
-     * Returns true is the value is positive of null
-     *
-     * @return a boolean
-     */
-    public boolean isPositive() {
-        // TODO do our best...
-        return false;
-    }
-
-    /**
-     * Returns true is the value is positive of null
-     *
-     * @return a boolean
-     */
-    public boolean isStrictlyPositive() {
-        return false;
-        // TODO do our best...
-    }
-
-    /**
-     * Returns true is the value is zero
-     *
-     * @return a boolean
-     */
-    public boolean isZero() {
-        // TODO do our best...
-        return false;
-    }
-
-
-    /**
-     * Compares two values for equality.
-     *
-     * @param value The other value.
-     */
-    public boolean equals(Object value) {
-        if (!(value instanceof CssMin)) {
-            return false;
-        }
-        CssMin other = (CssMin) value;
-        boolean match;
-        // this is inherently wrong, as we should check only the min value, but in that case we
-        // would need to explicitly compute them which is not done.
-        for (CssValue v : this.values) {
-            match = false;
-            for (CssValue ov : other.values) {
-                if (v.equals(ov)) {
-                    match = true;
-                    break;
-                }
-            }
-            if (!match) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * check if the value is positive or null
-     *
-     * @param ac         the validation context
-     * @param callername the property the value is defined in
-     * @throws InvalidParamException
-     */
-    public void checkPositiveness(ApplContext ac, String callername)
-            throws InvalidParamException {
-        // TODO do our best...
-        if (false /*!isPositive()*/) {
-            throw new InvalidParamException("negative-value",
-                    toString(), callername, ac);
-        }
-    }
-
-    /**
-     * check if the value is strictly positive
-     *
-     * @param ac         the validation context
-     * @param callername the property the value is defined in
-     * @throws InvalidParamException
-     */
-    public void checkStrictPositiveness(ApplContext ac, String callername)
-            throws InvalidParamException {
-        // TODO do our best...
-        if (false/*!isStrictlyPositive()*/) {
-            throw new InvalidParamException("strictly-positive",
-                    toString(), callername, ac);
-        }
-    }
-
-    /**
-     * check if the value is an integer
-     *
-     * @param ac         the validation context
-     * @param callername the property the value is defined in
-     * @throws InvalidParamException
-     */
-    public void checkInteger(ApplContext ac, String callername)
-            throws InvalidParamException {
-        // TODO do our best...
-        if (false/*!isInteger()*/) {
-            throw new InvalidParamException("integer",
-                    toString(), callername, ac);
-        }
-    }
-
-    /**
-     * warn if the value is not positive or null
-     *
-     * @param ac         the validation context
-     * @param callername the property the value is defined in
-     */
-    public boolean warnPositiveness(ApplContext ac, String callername) {
-        // TODO do our best...
-        if (false/*!isPositive()*/) {
-            ac.getFrame().addWarning("negative", toString());
-            return false;
-        }
-        return true;
-    }
-
-    public CssLength getLength() throws InvalidParamException {
-        if (computed_type == CssTypes.CSS_LENGTH) {
-            for (CssValue v : values) {
-                if (v.getType() == CssTypes.CSS_LENGTH) {
-                    return v.getLength();
-                }
-            }
-        }
-        throw new ClassCastException("unknown");
-    }
-
-    public CssPercentage getPercentage() throws InvalidParamException {
-        if (computed_type == CssTypes.CSS_PERCENTAGE) {
-            for (CssValue v : values) {
-                if (v.getType() == CssTypes.CSS_PERCENTAGE) {
-                    return v.getPercentage();
-                }
-            }
-        }
-        throw new ClassCastException("unknown");
-    }
-
-    public CssNumber getNumber() throws InvalidParamException {
-        if (computed_type == CssTypes.CSS_NUMBER) {
-            for (CssValue v : values) {
-                if (v.getType() == CssTypes.CSS_NUMBER) {
-                    return v.getNumber();
-                }
-            }
-        }
-        throw new ClassCastException("unknown");
-    }
-
-    public CssTime getTime() throws InvalidParamException {
-        if (computed_type == CssTypes.CSS_TIME) {
-            for (CssValue v : values) {
-                if (v.getType() == CssTypes.CSS_TIME) {
-                    return v.getTime();
-                }
-            }
-        }
-        throw new ClassCastException("unknown");
-    }
-
-    public CssAngle getAngle() throws InvalidParamException {
-        if (computed_type == CssTypes.CSS_ANGLE) {
-            for (CssValue v : values) {
-                if (v.getType() == CssTypes.CSS_ANGLE) {
-                    return v.getAngle();
-                }
-            }
-        }
-        throw new ClassCastException("unknown");
-    }
-
-    public CssFrequency getFrequency() throws InvalidParamException {
-        if (computed_type == CssTypes.CSS_FREQUENCY) {
-            for (CssValue v : values) {
-                if (v.getType() == CssTypes.CSS_FREQUENCY) {
-                    return v.getFrequency();
-                }
-            }
-        }
-        throw new ClassCastException("unknown");
-    }
-
-    /**
-     * check if the value is equal to zero
-     *
-     * @param ac         the validation context
-     * @param callername the property the value is defined in
-     * @throws InvalidParamException
-     */
-    public void checkEqualsZero(ApplContext ac, String callername)
-            throws InvalidParamException {
-        // we can't check so we only warn.
-        // TODO should we do that only for CSS_NUMBER type?
-        warnEqualsZero(ac, callername);
-    }
-
-    /**
-     * warn if the value is not zero
-     *
-     * @param ac         the validation context
-     * @param callername the property the value is defined in
-     */
-    public boolean warnEqualsZero(ApplContext ac, String callername) {
-        // TODO should we do that only for CSS_NUMBER type?
-        if (!isZero()) {
-            ac.getFrame().addWarning("dynamic", toString());
-            return false;
-        }
-        return true;
-    }
-}
diff --git a/org/w3c/css/values/CssNumber.java b/org/w3c/css/values/CssNumber.java
index 34854c044..ba1dd3358 100644
--- a/org/w3c/css/values/CssNumber.java
+++ b/org/w3c/css/values/CssNumber.java
@@ -28,6 +28,7 @@ public final int getType() {
     ApplContext ac;
     BigDecimal value;
     boolean isInt = false;
+    String _strval = null;
 
     /**
      * Create a new CssNumber
@@ -55,14 +56,34 @@ public CssNumber(float value) {
      */
     public void set(String s, ApplContext ac)
             throws InvalidParamException {
+        boolean negate = false;
+        String val;
         if (ac.getCssVersion().compareTo(CssVersion.CSS3) < 0) {
             // check for scientific notation in CSS < 3
             if (s.indexOf('e') >= 0 || s.indexOf('E') >= 0) {
                 throw new InvalidParamException("value", "number", s, ac);
             }
         }
-        value = new BigDecimal(s);
-        isInt = (s.indexOf('.') < 0);
+        if (s.startsWith("-")) {
+            negate = true;
+            val = s.substring(1);
+        } else if (s.startsWith("+")) {
+            val = s.substring(1);
+        } else {
+            val = s;
+        }
+
+        if (val.equalsIgnoreCase("pi")) {
+            value = BigDecimal.valueOf(Math.PI);
+            isInt = false;
+            _strval = "pi";
+        } else if (val.equalsIgnoreCase("e")) {
+            value = BigDecimal.valueOf(Math.E);
+            isInt = false;
+            _strval = "e";
+        } else {
+            value = new BigDecimal(val);
+            isInt = (val.indexOf('.') < 0);
 /*		CSS integers are not value-based integers.
         try {
 			value.toBigIntegerExact();
@@ -70,6 +91,13 @@ public void set(String s, ApplContext ac)
 		} catch (ArithmeticException e) {
 			isInt = false;
 		} */
+        }
+        if (negate) {
+            value = value.negate();
+            if (_strval != null) {
+                _strval = '-' + _strval;
+            }
+        }
         this.ac = ac;
     }
 
@@ -242,6 +270,9 @@ public CssNumber getNumber() throws InvalidParamException {
      * Returns a string representation of the object.
      */
     public String toString() {
+        if (_strval != null) {
+            return _strval;
+        }
         return value.toPlainString();
     }
 
diff --git a/org/w3c/css/values/CssRatio.java b/org/w3c/css/values/CssRatio.java
index 02fc6b5b4..58c91fc93 100644
--- a/org/w3c/css/values/CssRatio.java
+++ b/org/w3c/css/values/CssRatio.java
@@ -65,6 +65,18 @@ public CssRatio(CssValue gw, BigDecimal h) {
         this.h = h;
     }
 
+    public CssRatio(CssValue gw) {
+        if (gw.getRawType() == CssTypes.CSS_NUMBER) {
+            try {
+                this.w = gw.getNumber().getBigDecimalValue();
+            } catch (Exception ex) {
+                this.gw = gw;
+            }
+        } else {
+            this.gw = gw;
+        }
+    }
+
     public CssRatio(CssValue gw, CssValue gh) {
         if (gw.getRawType() == CssTypes.CSS_NUMBER) {
             try {
@@ -145,6 +157,9 @@ public String toString() {
         } else {
             sb.append(gw.toString()).append(' ');
         }
+        if (h == null && gh == null) {
+            return sb.toString();
+        }
         sb.append('/');
         if (h != null) {
             sb.append(h.toPlainString());
@@ -163,6 +178,9 @@ public boolean equals(Object value) {
         try {
             CssRatio other = (CssRatio) value;
             // check that the ratio are the same
+            if (h == null && gh == null) {
+                return (other.h == null) && (other.gh == null) && (w.compareTo(other.w) == 0);
+            }
             BigDecimal ratio, other_ratio;
             ratio = w.divide(h, RoundingMode.CEILING);
             other_ratio = other.w.divide(other.h, RoundingMode.CEILING);
diff --git a/org/w3c/css/values/CssTypes.java b/org/w3c/css/values/CssTypes.java
index 06e1cdfa3..4a2fb92b4 100644
--- a/org/w3c/css/values/CssTypes.java
+++ b/org/w3c/css/values/CssTypes.java
@@ -34,11 +34,9 @@ public class CssTypes {
     public static final int CSS_FLEX = 21;
     public static final int CSS_BRACKET = 22;
     public static final int CSS_COMPARATOR = 23;
-    public static final int CSS_MIN = 24;
-    public static final int CSS_MAX = 25;
-    public static final int CSS_CLAMP = 26;
-    public static final int CSS_VARIABLE = 27;
-    public static final int CSS_VARIABLE_DEFINITION = 28;
+    public static final int CSS_MATH_FUNCTION = 24;
+    public static final int CSS_VARIABLE = 25;
+    public static final int CSS_VARIABLE_DEFINITION = 26;
 
     // not really a property value
     public static final int CSS_ANPLUSB = 48;
diff --git a/org/w3c/css/values/CssUnitsCSS3.java b/org/w3c/css/values/CssUnitsCSS3.java
index 53db500ed..86f0f40d6 100644
--- a/org/w3c/css/values/CssUnitsCSS3.java
+++ b/org/w3c/css/values/CssUnitsCSS3.java
@@ -11,15 +11,18 @@
 import java.math.BigDecimal;
 
 /**
- * @spec http://www.w3.org/TR/2012/CR-css3-values-20120828/
+ * @spec https://www.w3.org/TR/2021/WD-css-values-4-20211016/
  * @spec http://www.w3.org/TR/2012/CR-css3-speech-20120320/
  * @spec https://www.w3.org/TR/2016/CR-css-grid-1-20160929/#typedef-flex
  * @spec https://github.com/w3c/csswg-drafts/blob/642e0f0b369c95619e6398788a943301656a89b8/css-values-4/Overview.bs
- *       (for dimension 'x')
+ * (for dimension 'x')
  */
 public class CssUnitsCSS3 {
     private static final String[] relative_length_units = {
-            "em", "ex", "ch", "rem", "vw", "vh", "vmin", "vmax"
+            "em", "rem", "ex", "rex", "cap", "rcap", "ch", "rch", "ic", "ric", "lh", "rlh",
+            "vw", "svw", "lvw", "dvw", "vh", "svh", "lvh", "dvh",
+            "vi", "svi", "lvi", "dvi", "vb", "svb", "lvb", "dvb",
+            "vmin", "svmin", "lvmin", "dvnim", "vmax", "svmax", "lvmax", "dvmax"
     };
 
     private static final String[] absolute_length_units = {
diff --git a/org/w3c/css/values/CssVariable.java b/org/w3c/css/values/CssVariable.java
index f3c452456..e1e617d62 100644
--- a/org/w3c/css/values/CssVariable.java
+++ b/org/w3c/css/values/CssVariable.java
@@ -49,6 +49,24 @@ public final int getType() {
         return computed_type;
     }
 
+    public final CssExpression getVariableExpression() {
+        if (ac != null) {
+            StyleSheet s = ac.getStyleSheet();
+            if (s != null) {
+                CssCustomProperty cp = s.getCustomProperty(variable_name);
+                if (cp != null) {
+                    CssVariableDefinition vd = (CssVariableDefinition) cp.value;
+                    if (vd != null) {
+                        if (vd.size() > 0) {
+                            return vd.expression;
+                        }
+                    }
+                }
+            }
+        }
+        return null;
+    }
+
     String variable_name = null;
     ApplContext ac;
     int computed_type = CssTypes.CSS_UNKNOWN;
@@ -127,7 +145,7 @@ public String toString() {
     private boolean _isCheckableType(int type) {
         switch (type) {
             case CssTypes.CSS_ANGLE:
-            case CssTypes.CSS_CLAMP:
+            case CssTypes.CSS_MATH_FUNCTION:
             case CssTypes.CSS_FLEX:
             case CssTypes.CSS_FREQUENCY:
             case CssTypes.CSS_LENGTH:
diff --git a/org/w3c/css/values/CssVariableDefinition.java b/org/w3c/css/values/CssVariableDefinition.java
index 08caf3e6d..93a26c327 100644
--- a/org/w3c/css/values/CssVariableDefinition.java
+++ b/org/w3c/css/values/CssVariableDefinition.java
@@ -42,7 +42,11 @@ public CssVariableDefinition() {
      * @param exp the CssExpression
      */
     public CssVariableDefinition(CssExpression exp) {
-        expression = exp;
+        if (exp.getCount() > 0) {
+            expression = exp;
+        } else {
+            unparsable_value = "";
+        }
     }
 
     /**
diff --git a/org/w3c/css/values/LightDark.java b/org/w3c/css/values/LightDark.java
new file mode 100644
index 000000000..e61d78671
--- /dev/null
+++ b/org/w3c/css/values/LightDark.java
@@ -0,0 +1,61 @@
+//
+// Author: Yves Lafon 
+//
+// (c) COPYRIGHT MIT, ERCIM, Keio University, Beihang University 2018.
+// Please first read the full copyright statement in file COPYRIGHT.html
+//
+package org.w3c.css.values;
+
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+
+public class LightDark {
+    String output = null;
+    CssColor light, dark;
+    boolean has_css_variable = false;
+
+    /**
+     * Create a new LightDark
+     */
+    public LightDark() {
+    }
+
+    public final void setLight(ApplContext ac, CssValue val) throws InvalidParamException {
+        if (val.getType() == CssTypes.CSS_COLOR) {
+            light = (CssColor) val;
+            if (light.hasCssVariable()) {
+                has_css_variable = true;
+            }
+            output = null;
+        }
+    }
+
+    public final void setDark(ApplContext ac, CssValue val) throws InvalidParamException {
+        if (val.getType() == CssTypes.CSS_COLOR) {
+            dark = (CssColor) val;
+            if (dark.hasCssVariable()) {
+                has_css_variable = true;
+            }
+            output = null;
+        }
+    }
+
+    public boolean equals(LightDark other) {
+        if (other != null) {
+            return (light.equals(other.light) && dark.equals(other.dark));
+        }
+        return false;
+    }
+
+    /**
+     * Returns a string representation of the object.
+     */
+    public String toString() {
+        if (output == null) {
+            StringBuilder sb = new StringBuilder("light-dark(");
+            sb.append(light).append(", ").append(dark).append(')');
+            output = sb.toString();
+        }
+        return output;
+    }
+}
diff --git a/style/tabtastic.css b/style/tabtastic.css
deleted file mode 100644
index 6fc92dda6..000000000
--- a/style/tabtastic.css
+++ /dev/null
@@ -1,14 +0,0 @@
-/* specific style triggered by javascript */ 
-
-.tabset_content	{ display:none; }
-.tabset_label	{ display:none }
-
-.tabset_content_active	{ display:block }
-* html legend { position:absolute; top: -25em !important; left: -25em !important; }
-* html fieldset{ position: relative; margin-top:0 !important; padding-top:0 !important;}
-@media aural{
-	.tabset_content,
-	.tabset_label	{ display:block }
-}
-
-
diff --git a/tabtastic/addclasskillclass.js b/tabtastic/addclasskillclass.js
deleted file mode 100644
index b71c3120f..000000000
--- a/tabtastic/addclasskillclass.js
+++ /dev/null
@@ -1,14 +0,0 @@
-//*** This code is copyright 2002-2003 by Gavin Kistner and Refinery; www.refinery.com
-//*** It is covered under the license viewable at http://phrogz.net/JS/_ReuseLicense.txt
-//*** Reuse or modification is free provided you abide by the terms of that license.
-//*** (Including the first two lines above in your source code satisfies the conditions.)
-
-//***Adds a new class to an object, preserving existing classes
-function AddClass(obj,cName){ KillClass(obj,cName); return obj && (obj.className+=(obj.className.length>0?' ':'')+cName); }
-
-//***Removes a particular class from an object, preserving other existing classes.
-function KillClass(obj,cName){ return obj && (obj.className=obj.className.replace(new RegExp("^"+cName+"\\b\\s*|\\s*\\b"+cName+"\\b",'g'),'')); }
-
-//***Returns true if the object has the class assigned, false otherwise.
-function HasClass(obj,cName){ return (!obj || !obj.className)?false:(new RegExp("\\b"+cName+"\\b")).test(obj.className) }
-
diff --git a/tabtastic/addcss.js b/tabtastic/addcss.js
deleted file mode 100644
index a6c9f421b..000000000
--- a/tabtastic/addcss.js
+++ /dev/null
@@ -1,59 +0,0 @@
-//*** This code is copyright 2002-2003 by Gavin Kistner, gavin@refinery.com
-//*** It is covered under the license viewable at http://phrogz.net/JS/_ReuseLicense.txt
-//*** Reuse or modification is free provided you abide by the terms of that license.
-//*** (Including the first two lines above in your source code satisfies the conditions.)
-
-// Add a new stylesheet to the document;
-// url [optional] A url to an external stylesheet to use
-// idx [optional] The index in document.styleSheets to insert the new sheet before
-function AddStyleSheet(url,idx){
-	var css,before=null,head=document.getElementsByTagName("head")[0];
-
-	if (document.createElement){
-		if (url){
-			css = document.createElement('link');
-			css.rel  = 'stylesheet';
-			css.href = url;
-		} else css = document.createElement('style');
-		css.media = 'all';
-		css.type  = 'text/css';
-
-		if (idx>=0){
-			for (var i=0,ct=0,len=head.childNodes.length;i
   

-   

+   

    CSS Validation Service
    

      Check Cascading Style Sheets (CSS) and (X)HTML documents with style sheets
@@ -26,7 +26,7 @@ 
Quality Assurance tools development effort "qa-dev".

+	by W3C staff and volunteers, under the auspices of the Quality Assurance tools development effort "qa-dev".

 
 
     
It was first written by Philippe Le Hégaret and Sijtsche Smeman.
@@ -72,7 +72,7 @@ 
Translations
       
Greek: Manuel Montero Pineda
       
Hindi: Bhavatmaj Seth
     
-    
If you wish to help with translations, see the process and list of 
+    
If you wish to help with translations, see the process and list of 
             pending translations on the W3C wiki site.
 
 	   

@@ -86,32 +86,15 @@ 
Translations
 	   

    

 
-	      
+	      
 	   
      

-     
-     
+     
+     
      
      
 
-	    

-	      Copyright © 1994-2009
-	      W3C®
-
-	      (MIT,
-	      ERCIM,
-	      Keio),
-	      All Rights Reserved.
-	      W3C liability,
-	      trademark,
-	      document use
-	      and software licensing
-
-	      rules apply. Your interactions with this site are in accordance
-	      with our public and
-	      Member privacy
-	      statements.
-	    
+     
Copyright © 2025 World Wide Web Consortium.
 W3C® liability, trademark and permissive license rules apply.
 
 
 	  
diff --git a/translations.html b/translations.html
index e7dcb31de..d3f3d1aff 100644
--- a/translations.html
+++ b/translations.html
@@ -16,7 +16,7 @@
 
   
    

-    

+    

     CSS Validation Service
     

       Check Cascading Style Sheets (CSS) and (X)HTML documents with style sheets
@@ -29,8 +29,8 @@ 
Translation of the W3C CSS Validator
 
Translate the CSS validator in a new language
 
If the CSS validator is not yet available in your native language and you would like to translate it:
 

-  
Download the translation kit. Unpack the kit: It includes a number of HTML documents, a file with all the strings used for the validator messages, and a text files with instructions.
-  
Get in touch with us before you start translating: someone may already be on the job. Someone from the W3C staff or validator development team will get back to you with details about how to translate the validator.
+  
Download the translation kit. Unpack the kit: It includes a number of HTML documents, a file with all the strings used for the validator messages, and a text files with instructions.
+  
Get in touch with us before you start translating: someone may already be on the job. Someone from the W3C staff or validator development team will get back to you with details about how to translate the validator.
   
Translate. Congratulations, you have made the CSS validator more accessible to a lot more Web developers and designers.
 
 
@@ -3328,46 +3328,46 @@ 
Help complete the translation of the validator in your language
 ✔
 ✔
 ✔
-note_valide_html
To work as intended, your CSS style sheet needs a correct document parse tree. This means you should use <a href="http://validator.w3.org/">valid HTML</a>.
✔
-✔
-✔
-✔
-✔
-✔
-✔
-✔
-✔
+note_valide_html
To work as intended, your CSS style sheet needs a correct document parse tree. This means you should use <a href="https://validator.w3.org/">valid HTML</a>.
✔
+✔
+✔
+✔
+✔
+✔
+✔
+✔
+✔
 ✔
-✔
-✔
-✔
+✔
+✔
+✔
 ✔
-✔
-✔
-✔
-✔
-✔
-✔
-note_xhtml_valid
If you want to validate your CSS style sheet embedded in an (X)HTML document, you should first <a href="http://validator.w3.org/">check that the (X)HTML you use is valid</a>
✔
-✔
-✔
-✔
-✔
-✔
-✔
-✔
-✔
-✔
-✔
-✔
-✔
-✔
-✔
-✔
-✔
-✔
-✔
-✔
+✔
+✔
+✔
+✔
+✔
+✔
+note_xhtml_valid
If you want to validate your CSS style sheet embedded in an (X)HTML document, you should first <a href="https://validator.w3.org/">check that the (X)HTML you use is valid</a>
✔
+✔
+✔
+✔
+✔
+✔
+✔
+✔
+✔
+✔
+✔
+✔
+✔
+✔
+✔
+✔
+✔
+✔
+✔
+✔
 output-encoding-name
utf-8
✔
 ✔
 ✔
@@ -5750,32 +5750,15 @@ 
Help complete the translation of the validator in your language
 
 

    

-     
+     
    
    

-   
-   
+   
+   
    
    
 
-    

-      Copyright © 1994-2009
-      W3C®
-
-      (MIT,
-      ERCIM,
-      Keio),
-      All Rights Reserved.
-      W3C liability,
-      trademark,
-      document use
-      and software licensing
-
-      rules apply. Your interactions with this site are in accordance
-      with our public and
-      Member privacy
-      statements.
-    
+   
Copyright © 2025 World Wide Web Consortium.
 W3C® liability, trademark and permissive license rules apply.
 
   
 
diff --git a/validator.html.bg b/validator.html.bg
index 0ccdf6a53..5a435c582 100644
--- a/validator.html.bg
+++ b/validator.html.bg
@@ -17,7 +17,7 @@
 
   
    

-    

+    

     CSS Validation Service
     

       Проверка на Cascading Style Sheets (CSS) и (X)HTML документи със style sheets
@@ -30,7 +30,7 @@
       

 
       

-        
Валидиране по URI
+        
Валидиране по URI
         
         

           Въведете URI на документ (HTML с CSS или само CSS), който желаете да бъде валидиран:
@@ -124,7 +124,7 @@
       
 
       

-        
Валидиране чрез изпращане на файл
+        
Валидиране чрез изпращане на файл
       
         
Изберете документ, който да бъде валидиран (само CSS файлове):
         

@@ -214,7 +214,7 @@
       
 
       

-        
Валидиране чрез директно въвеждане
+        
Валидиране чрез директно въвеждане
         
         
Въведете CSS, който желаете да се валидира:
         

@@ -314,10 +314,10 @@
       

   
 
   
-  

+  

 
   

-  
Пояснение: Ако желаете да валидирате CSS style sheet, вписана в (X)HTML документ, трябва първо да проверите дали използваният (X)HTML е валиден.
+  
Пояснение: Ако желаете да валидирате CSS style sheet, вписана в (X)HTML документ, трябва първо да проверите дали използваният (X)HTML е валиден.
   
   
   

@@ -480,32 +480,16 @@
 
 

    

-     
+     
    
    

-   
-   
+   
+   
    
    
 
-    

-      Copyright © 1994-2009
-      W3C®
+   
Copyright © 2025 World Wide Web Consortium.
 W3C® liability, trademark and permissive license rules apply.
 
-      (MIT,
-      ERCIM,
-      Keio),
-      All Rights Reserved.
-      W3C liability,
-      trademark,
-      document use
-      and software licensing
-
-      rules apply. Your interactions with this site are in accordance
-      with our public and
-      Member privacy
-      statements.
-    

 
   
 
diff --git a/validator.html.cs b/validator.html.cs
index c37aa2d25..8c15e7fba 100644
--- a/validator.html.cs
+++ b/validator.html.cs
@@ -17,7 +17,7 @@
 
   
    

-    

+    

     CSS Validation Service
     

       Zkontrolovat tabulky kaskádových stylů (CSS) a dokumenty  (X)HTML s tabulkami stylů.
@@ -30,7 +30,7 @@ Zkontrolovat tabulky kaskádových stylů (CSS) a dokumenty  (X)HTML s tabulkami
       

 
       

-        
Ověřením URI
+        
Ověřením URI
         
         

           Zadejte URI dokumentu (HTML pouze s CSS nebo CSS), který chcete ověřit.:
@@ -124,7 +124,7 @@ Zadejte URI dokumentu (HTML pouze s CSS nebo CSS), který chcete ověřit.:
       
 
       

-        
Ověřit po nahrání souboru
+        
Ověřit po nahrání souboru
       
         
Vyberte dokument, který chcete ověřit:
         

@@ -214,7 +214,7 @@ Zadejte URI dokumentu (HTML pouze s CSS nebo CSS), který chcete ověřit.:
       
 
       

-        
Ověřte přímým vstupem
+        
Ověřte přímým vstupem
         
         
Zadejte CSS, kterou chcete ověřit:
         

@@ -314,10 +314,10 @@ Zadejte URI dokumentu (HTML pouze s CSS nebo CSS), který chcete ověřit.:
       

   
 
   
-  

+  

 
   

-  
Poznámka: Pokud chcete ověřit svůj CSS styl vložený do dokumentu (X)HTML měli byste nejprve zkontrolovat  , že vámi použité (X)HTML je platné .
+  
Poznámka: Pokud chcete ověřit svůj CSS styl vložený do dokumentu (X)HTML měli byste nejprve zkontrolovat  , že vámi použité (X)HTML je platné .
   
   
   

@@ -480,32 +480,15 @@ Zadejte URI dokumentu (HTML pouze s CSS nebo CSS), který chcete ověřit.:
 
 

    

-     
+     
    
    

-   
-   
+   
+   
    
    
 
-    

-      Copyright © 1994-2009
-      W3C®
-
-      (MIT,
-      ERCIM,
-      Keio),
-      All Rights Reserved.
-      W3C liability,
-      trademark,
-      document use
-      and software licensing
-
-      rules apply. Your interactions with this site are in accordance
-      with our public and
-      Member privacy
-      statements.
-    
+    
Copyright © 2025 World Wide Web Consortium.
 W3C® liability, trademark and permissive license rules apply.
 
   
 
diff --git a/validator.html.de b/validator.html.de
index 40ae761cc..b5861a63a 100644
--- a/validator.html.de
+++ b/validator.html.de
@@ -17,7 +17,7 @@
 
   
    

-    

+    

     CSS Validation Service
     

       Cascading Style Sheets (CSS) und (X)HTML-Dokumente mit CSS validieren
@@ -30,7 +30,7 @@
       

 
       

-        
Validierung per URI
+        
Validierung per URI
         
         

           Geben Sie die URI eines Dokuments ein, das Sie validieren möchten (CSS oder HTML mit CSS):
@@ -124,7 +124,7 @@
       
 
       

-        
Validierung per Datei-Upload
+        
Validierung per Datei-Upload
       
         
Wählen Sie eine lokale Datei, die Sie validieren möchten:
         

@@ -214,7 +214,7 @@
       
 
       

-        
Validierung per Direkteingabe
+        
Validierung per Direkteingabe
         
         
Geben Sie den CSS Code ein, den Sie überprüfen möchten:
         

@@ -314,10 +314,10 @@
       

   
 
   
-  

+  

 
   

-  
Achtung: Wenn Sie CSS-Code in einem (X)HTML-Dokument validieren möchten, sollten Sie zunächst prüfen, ob das (X)HTML-Dokument valide ist.
+  
Achtung: Wenn Sie CSS-Code in einem (X)HTML-Dokument validieren möchten, sollten Sie zunächst prüfen, ob das (X)HTML-Dokument valide ist.
   
   
   

@@ -480,32 +480,15 @@
 
 

    

-     
+     
    
    

-   
-   
+   
+   
    
    
 
-    

-      Copyright © 1994-2009
-      W3C®
-
-      (MIT,
-      ERCIM,
-      Keio),
-      All Rights Reserved.
-      W3C liability,
-      trademark,
-      document use
-      and software licensing
-
-      rules apply. Your interactions with this site are in accordance
-      with our public and
-      Member privacy
-      statements.
-    
+   
Copyright © 2025 World Wide Web Consortium.
 W3C® liability, trademark and permissive license rules apply.
 
   
 
diff --git a/validator.html.el b/validator.html.el
index f1f696541..5875dec7a 100644
--- a/validator.html.el
+++ b/validator.html.el
@@ -17,7 +17,7 @@
 
   
    

-    

+    

     CSS Validation Service
     

       Έλεγχος Cascading Style Sheets (CSS) και αρχείων (X)HTML με style sheets
@@ -30,7 +30,7 @@
       

 
       

-        
Έλεγχος εγκυρότητας με URI
+        
Έλεγχος εγκυρότητας με URI
         
         

           Εισάγετε το URI του αρχείου (HTML με CSS ή μόνο CSS) που θέλετε να ελέγξετε την εγκυρότητα:
@@ -124,7 +124,7 @@
       
 
       

-        
Έλεγχος εγκυρότητας με μεταφορά αρχείου
+        
Έλεγχος εγκυρότητας με μεταφορά αρχείου
       
         
Επιλέξτε το αρχείο που επιθυμείτε να ελέγξετε την εγκυρότητα:
         

@@ -214,7 +214,7 @@
       
 
       

-        
Έλεγχος εγκυρότητας με άμεση εισαγωγή
+        
Έλεγχος εγκυρότητας με άμεση εισαγωγή
         
         
Εισάγετε το CSS που θέλετε να ελέγξετε την εγκυρότητα:
         

@@ -314,10 +314,10 @@
       

   
 
   
-  

+  

 
   

-  
Σημείωση: Εάν επιθυμείτε να ελέγξετε την εγκυρότητα ενός CSS style sheet που είναι ενσωματωμένο σε ένα αρχείο (X)HTML, πρέπει αρχικά να ελέγξετε ότι είναι έγκυρο το αρχείο (X)HTML που χρησιμοποιείτε.
+  
Σημείωση: Εάν επιθυμείτε να ελέγξετε την εγκυρότητα ενός CSS style sheet που είναι ενσωματωμένο σε ένα αρχείο (X)HTML, πρέπει αρχικά να ελέγξετε ότι είναι έγκυρο το αρχείο (X)HTML που χρησιμοποιείτε.
   
   
   

@@ -480,32 +480,15 @@
 
 

    

-     
+     
    
    

-   
-   
+   
+   
    
    
 
-    

-      Copyright © 1994-2009
-      W3C®
-
-      (MIT,
-      ERCIM,
-      Keio),
-      All Rights Reserved.
-      W3C liability,
-      trademark,
-      document use
-      and software licensing
-
-      rules apply. Your interactions with this site are in accordance
-      with our public and
-      Member privacy
-      statements.
-    
+   
Copyright © 2025 World Wide Web Consortium.
 W3C® liability, trademark and permissive license rules apply.
 
   
 
diff --git a/validator.html.en b/validator.html.en
index 35ad82722..f2537b3b9 100644
--- a/validator.html.en
+++ b/validator.html.en
@@ -17,7 +17,7 @@
 
   
    

-    

+    

     CSS Validation Service
     

       Check Cascading Style Sheets (CSS) and (X)HTML documents with style sheets
@@ -30,7 +30,7 @@
       

 
       

-        
Validate by URI
+        
Validate by URI
         
         

           Enter the URI of a document (HTML with CSS or CSS only) you would like validated:
@@ -124,7 +124,7 @@
       
 
       

-        
Validate by file upload
+        
Validate by file upload
       
         
Choose the document you would like validated:
         

@@ -214,7 +214,7 @@
       
 
       

-        
Validate by direct input
+        
Validate by direct input
         
         
Enter the CSS you would like validated:
         

@@ -314,10 +314,10 @@
       

   
 
   
-  

+  

 
   

-  
Note: If you want to validate your CSS style sheet embedded in an (X)HTML document, you should first check that the (X)HTML you use is valid.
+  
Note: If you want to validate your CSS style sheet embedded in an (X)HTML document, you should first check that the (X)HTML you use is valid.
   
   
   

@@ -480,32 +480,15 @@
 
 

    

-     
+     
    
    

-   
-   
+   
+   
    
    
 
-    

-      Copyright © 1994-2009
-      W3C®
-
-      (MIT,
-      ERCIM,
-      Keio),
-      All Rights Reserved.
-      W3C liability,
-      trademark,
-      document use
-      and software licensing
-
-      rules apply. Your interactions with this site are in accordance
-      with our public and
-      Member privacy
-      statements.
-    
+   
Copyright © 2025 World Wide Web Consortium.
 W3C® liability, trademark and permissive license rules apply.
 
   
 
diff --git a/validator.html.es b/validator.html.es
index fa41dd5aa..2dad8080a 100644
--- a/validator.html.es
+++ b/validator.html.es
@@ -17,7 +17,7 @@
 
   
    

-    

+    

     CSS Validation Service
     

       Verifica Hojas de Estilo en Cascada (CSS) y documentos (X)HTML con hojas de estilo
@@ -30,7 +30,7 @@
       

 
       

-        
Validar mediante URI
+        
Validar mediante URI
         
         

           Introduce la URI de un documento (HTML con CSS o sólo CSS) que desees validar:
@@ -124,7 +124,7 @@
       
 
       

-        
Validar mediante Carga de un Archivo
+        
Validar mediante Carga de un Archivo
       
         
Elige el documento que desees validar:
         

@@ -214,7 +214,7 @@
       
 
       

-        
Validar mediante entrada directa
+        
Validar mediante entrada directa
         
         
Introduce el código CSS que desees validar:
         

@@ -314,10 +314,10 @@
       

   
 
   
-  

+  

 
   

-  
Nota: Si deseas validar tu hoja de estilo CSS incrustada en un documento (X)HTML, deberías antes comprobar que el  (X)HTML utilizado es válido.
+  
Nota: Si deseas validar tu hoja de estilo CSS incrustada en un documento (X)HTML, deberías antes comprobar que el  (X)HTML utilizado es válido.
   
   
   

@@ -480,32 +480,15 @@
 
 

    

-     
+     
    
    

-   
-   
+   
+   
    
    
 
-    

-      Copyright © 1994-2009
-      W3C®
-
-      (MIT,
-      ERCIM,
-      Keio),
-      All Rights Reserved.
-      W3C liability,
-      trademark,
-      document use
-      and software licensing
-
-      rules apply. Your interactions with this site are in accordance
-      with our public and
-      Member privacy
-      statements.
-    
+   
Copyright © 2025 World Wide Web Consortium.
 W3C® liability, trademark and permissive license rules apply.
 
   
 
diff --git a/validator.html.fa b/validator.html.fa
index 318501492..03371689b 100644
--- a/validator.html.fa
+++ b/validator.html.fa
@@ -17,7 +17,7 @@
 
   
    

-    

+    

     CSS Validation Service
     

       دارای شیوه نامه X(HTML) و اسناد (CSS) بررسی شیوه نامه های آبشاری
@@ -30,7 +30,7 @@
       

 
       

-        
URI تایید اعتبار با
+        
URI تایید اعتبار با
         
         

           ای که می خواهید معتبر نمایید را، وارد نمایید (CSS یا تنها CSS دارای HTML) سند URI:
@@ -124,7 +124,7 @@
       
 
       

-        
تایید اعتبار با آپلود فایل
+        
تایید اعتبار با آپلود فایل
       
         
(CSS سندی که می خواهید معتبر نمایید را انتخاب کنید (تنها فایلهای:
         

@@ -214,7 +214,7 @@
       
 
       

-        
تایید اعتبار با ورودی مستقیم
+        
تایید اعتبار با ورودی مستقیم
         
         
ای را که می خواهید تایید اعتبار شود را وارد نمایید CSS:
         

@@ -314,10 +314,10 @@
       

   
 
   
-  

+  

 
   

-  
توجه:  مورد استفاده معتبر باشد (X)HTML بررسی نمایید که  خودتان را تایید اعتبار نمایید، نخست باید (X)HTML جاسازی شده در یک سند CSS اگر بخواهید شیوه نامه ی .
+  
توجه:  مورد استفاده معتبر باشد (X)HTML بررسی نمایید که  خودتان را تایید اعتبار نمایید، نخست باید (X)HTML جاسازی شده در یک سند CSS اگر بخواهید شیوه نامه ی .
   

   

   

@@ -480,32 +480,15 @@
 
 

    

-     
+     
    
    

-   
-   
+   
+   
    
    
 
-    

-      Copyright © 1994-2009
-      W3C®
-
-      (MIT,
-      ERCIM,
-      Keio),
-      All Rights Reserved.
-      W3C liability,
-      trademark,
-      document use
-      and software licensing
-
-      rules apply. Your interactions with this site are in accordance
-      with our public and
-      Member privacy
-      statements.
-    
+   
Copyright © 2025 World Wide Web Consortium.
 W3C® liability, trademark and permissive license rules apply.
 
   
 
diff --git a/validator.html.fr b/validator.html.fr
index c31747ddf..5baabafc2 100644
--- a/validator.html.fr
+++ b/validator.html.fr
@@ -17,7 +17,7 @@
 
   
    

-    

+    

     CSS Validation Service
     

       Vérifiez vos feuilles de style CSS et vos documents HTML stylés avec CSS
@@ -30,7 +30,7 @@
       

 
       

-        
Validation par adresse URI
+        
Validation par adresse URI
         
         

           Saisissez l'adresse URI du document (HTML avec CSS, ou CSS seul) à valider:
@@ -124,7 +124,7 @@
       
 
       

-        
Valider par Chargement de Fichier
+        
Valider par Chargement de Fichier
       
         
Choisissez la feuille de style à valider:
         

@@ -214,7 +214,7 @@
       
 
       

-        
Validation par Saisie Directe
+        
Validation par Saisie Directe
         
         
Saisissez la feuille de style à valider  (ATTENTION : feuilles de style CSS uniquement):
         

@@ -314,10 +314,10 @@
       

   
 
   
-  

+  

 
   

-  
Remarque: Si vous souhaitez valider une feuille de style incorporée dans un document (X)HTML, vous devriez d'abord vérifier la validité de votre document (X)HTML.
+  
Remarque: Si vous souhaitez valider une feuille de style incorporée dans un document (X)HTML, vous devriez d'abord vérifier la validité de votre document (X)HTML.
   
   
   

@@ -480,32 +480,15 @@
 
 

    

-     
+     
    
    

-   
-   
+   
+   
    
    
 
-    

-      Copyright © 1994-2009
-      W3C®
-
-      (MIT,
-      ERCIM,
-      Keio),
-      All Rights Reserved.
-      W3C liability,
-      trademark,
-      document use
-      and software licensing
-
-      rules apply. Your interactions with this site are in accordance
-      with our public and
-      Member privacy
-      statements.
-    
+   
Copyright © 2025 World Wide Web Consortium.
 W3C® liability, trademark and permissive license rules apply.
 
   
 
diff --git a/validator.html.hi b/validator.html.hi
index 48e4574db..85c8e0ee7 100644
--- a/validator.html.hi
+++ b/validator.html.hi
@@ -17,7 +17,7 @@
 
   
    

-    

+    

     CSS Validation Service
     

       शैली पत्रक के साथ कास्केडिंग शैली शीट (सीएसएस) और (X)HTML दस्तावेजों की जाँच करे।
@@ -30,7 +30,7 @@
       

 
       

-        
URI द्वारा मान्यकर्ण 
+        
URI द्वारा मान्यकर्ण 
         
         

           किसी दस्तावेज़ के URI को दर्ज कीजिये (HTML  सीएसएस के साथ या केवल सीएसएस) जिसका आप मान्यकर्ण करना चाहते हैं।:
@@ -124,7 +124,7 @@
       
 
       

-        
फ़ाइल अपलोड के द्वारा मान्यकर्ण करें
+        
फ़ाइल अपलोड के द्वारा मान्यकर्ण करें
       
         
मान्यकर्ण करने के लिए दस्तावेज़ चुनें:
         

@@ -214,7 +214,7 @@
       
 
       

-        
प्रत्यक्ष निवेश के द्वारा मान्यकर्ण करें
+        
प्रत्यक्ष निवेश के द्वारा मान्यकर्ण करें
         
         
मान्यकर्ण करने के लिए सीएसएस दर्ज करें:
         

@@ -314,10 +314,10 @@
       

   
 
   
-  

+  

 
   

-  
टिप्पणी: यदि आप अपने (X) HTML दस्तावेज़ में एम्बेड होई सीएसएस शैली शीट का मान्यकर्ण करना चाहते हैं, तो पहले आप जाँच करें कि जिस (X) HTML दस्तावेज़ का आप का उपयोग कर रहें हैं वो मान्यकृत है।.
+  
टिप्पणी: यदि आप अपने (X) HTML दस्तावेज़ में एम्बेड होई सीएसएस शैली शीट का मान्यकर्ण करना चाहते हैं, तो पहले आप जाँच करें कि जिस (X) HTML दस्तावेज़ का आप का उपयोग कर रहें हैं वो मान्यकृत है।.
   
   
   

@@ -480,32 +480,15 @@
 
 

    

-     
+     
    
    

-   
-   
+   
+   
    
    
 
-    

-      Copyright © 1994-2009
-      W3C®
-
-      (MIT,
-      ERCIM,
-      Keio),
-      All Rights Reserved.
-      W3C liability,
-      trademark,
-      document use
-      and software licensing
-
-      rules apply. Your interactions with this site are in accordance
-      with our public and
-      Member privacy
-      statements.
-    
+   
Copyright © 2025 World Wide Web Consortium.
 W3C® liability, trademark and permissive license rules apply.
 
   
 
diff --git a/validator.html.hu b/validator.html.hu
index f8006a2cd..9e07c2083 100644
--- a/validator.html.hu
+++ b/validator.html.hu
@@ -17,7 +17,7 @@
 
   
    

-    

+    

     CSS Validation Service
     

       Cascading Style Sheets (CSS) és stíluslapokkal rendelkező (X)HTML dokumentumok ellenőrzése
@@ -30,7 +30,7 @@
       

 
       

-        
Érvényesítés URI segítségével
+        
Érvényesítés URI segítségével
         
         

           Adja meg a dokumentum (HTML CSS-sel vagy csak CSS) URI-jét, melyet érvényesíteni szeretne:
@@ -124,7 +124,7 @@
       
 
       

-        
Érvényesítés file feltöltéssel
+        
Érvényesítés file feltöltéssel
       
         
Válassza ki az érvényesítendő dokumentumot:
         

@@ -214,7 +214,7 @@
       
 
       

-        
Érvényesítés közvetlen bevitellel
+        
Érvényesítés közvetlen bevitellel
         
         
Írja be a CSS-t, melyet érvényesíttetni szeretne:
         

@@ -314,10 +314,10 @@
       

   
 
   
-  

+  

 
   

-  
Megjegyzés: Ha CSS stíluslapját (X)HTML dokumentumba ágyazva szeretné érvényesíttetni, először ellenőrizze, hogy a használt (X)HTML érvényes-e.
+  
Megjegyzés: Ha CSS stíluslapját (X)HTML dokumentumba ágyazva szeretné érvényesíttetni, először ellenőrizze, hogy a használt (X)HTML érvényes-e.
   
   
   

@@ -480,32 +480,15 @@
 
 

    

-     
+     
    
    

-   
-   
+   
+   
    
    
 
-    

-      Copyright © 1994-2009
-      W3C®
-
-      (MIT,
-      ERCIM,
-      Keio),
-      All Rights Reserved.
-      W3C liability,
-      trademark,
-      document use
-      and software licensing
-
-      rules apply. Your interactions with this site are in accordance
-      with our public and
-      Member privacy
-      statements.
-    
+   
Copyright © 2025 World Wide Web Consortium.
 W3C® liability, trademark and permissive license rules apply.
 
   
 
diff --git a/validator.html.it b/validator.html.it
index 04fde5f6a..87439e290 100644
--- a/validator.html.it
+++ b/validator.html.it
@@ -17,7 +17,7 @@
 
   
    

-    

+    

     CSS Validation Service
     

       Verifica i fogli di stile a cascata (CSS) e i documenti (X)HTML contenenti fogli di stile
@@ -30,7 +30,7 @@
       

 
       

-        
Validazione tramite URI
+        
Validazione tramite URI
         
         

           Inserisci il percorso (URI) di un documento (HTML con CSS o solamente CSS) che desideri sottoporre alla validazione:
@@ -124,7 +124,7 @@
       
 
       

-        
Validazione tramite trasferimento file
+        
Validazione tramite trasferimento file
       
         
Seleziona il documento che desideri verificare:
         

@@ -214,7 +214,7 @@
       
 
       

-        
Validazione tramite immissione diretta
+        
Validazione tramite immissione diretta
         
         
Inserisci il testo del CSS che desideri validare:
         

@@ -314,10 +314,10 @@
       

   
 
   
-  

+  

 
   

-  
Nota: Se desideri verificare un foglio di stile CSS interno ad un documento (X)HTML, dovresti prima verificare la validità del codice (X)HTML.
+  
Nota: Se desideri verificare un foglio di stile CSS interno ad un documento (X)HTML, dovresti prima verificare la validità del codice (X)HTML.
   
   
   

@@ -480,32 +480,15 @@
 
 

    

-     
+     
    
    

-   
-   
+   
+   
    
    
 
-    

-      Copyright © 1994-2009
-      W3C®
-
-      (MIT,
-      ERCIM,
-      Keio),
-      All Rights Reserved.
-      W3C liability,
-      trademark,
-      document use
-      and software licensing
-
-      rules apply. Your interactions with this site are in accordance
-      with our public and
-      Member privacy
-      statements.
-    
+   
Copyright © 2025 World Wide Web Consortium.
 W3C® liability, trademark and permissive license rules apply.
 
   
 
diff --git a/validator.html.ja b/validator.html.ja
index ab5c05879..089151c6c 100644
--- a/validator.html.ja
+++ b/validator.html.ja
@@ -17,7 +17,7 @@
 
   
    

-    

+    

     CSS Validation Service
     

       カスケーディングスタイルシート(CSS)を検証
@@ -30,7 +30,7 @@
       

 
       

-        
URLで指定して検証
+        
URLで指定して検証
         
         

           検証したい文書(CSSと組み合わせたHTML文書、もしくはCSS単体の文書)のURIを入力してください:
@@ -124,7 +124,7 @@
       
 
       

-        
ソースファイルをアップロードして検証
+        
ソースファイルをアップロードして検証
       
         
検証したいCSS文書のソースファイル名を入力してください:
         

@@ -214,7 +214,7 @@
       
 
       

-        
テキストエリアに直接入力して検証
+        
テキストエリアに直接入力して検証
         
         
検証したいCSSをテキストエリアに入力してください (CSSソースのみ):
         

@@ -314,10 +314,10 @@
       

   
 
   
-  

+  

 
   

-  
メモ: CSSスタイルシートを意図した通りに機能させるには、正しい文書解析木が必要です。つまり、正当なHTMLを用いるべきです。.
+  
メモ: CSSスタイルシートを意図した通りに機能させるには、正しい文書解析木が必要です。つまり、正当なHTMLを用いるべきです。.
   
   
   

@@ -480,32 +480,15 @@
 
 

    

-     
+     
    
    

-   
-   
+   
+   
    
    
 
-    

-      Copyright © 1994-2009
-      W3C®
-
-      (MIT,
-      ERCIM,
-      Keio),
-      All Rights Reserved.
-      W3C liability,
-      trademark,
-      document use
-      and software licensing
-
-      rules apply. Your interactions with this site are in accordance
-      with our public and
-      Member privacy
-      statements.
-    
+   
Copyright © 2025 World Wide Web Consortium.
 W3C® liability, trademark and permissive license rules apply.
 
   
 
diff --git a/validator.html.ko b/validator.html.ko
index 0928d4c72..3715b2870 100644
--- a/validator.html.ko
+++ b/validator.html.ko
@@ -17,7 +17,7 @@
 
   
    

-    

+    

     CSS Validation Service
     

       캐스케이딩 스타일시트 (CSS) 와 스타일시트를 포함한 (X)HTML 문법검사
@@ -30,7 +30,7 @@
       

 
       

-        
URI 검사
+        
URI 검사
         
         

           검사하고자 하는 (HTML과 CSS 또는 CSS만으로 이루어진) 문서의 URI를 입력하여 주십시오:
@@ -124,7 +124,7 @@
       
 
       

-        
파일 업로드를 통한 검사
+        
파일 업로드를 통한 검사
       
         
검사를 할 문서를 선택하여 주십시오:
         

@@ -214,7 +214,7 @@
       
 
       

-        
직접 입력을 통한 검사
+        
직접 입력을 통한 검사
         
         
검사할 CSS를 입력하여 주십시오:
         

@@ -314,10 +314,10 @@
       

   
 
   
-  

+  

 
   

-  
주의: (X)HTML 문서에 포함된 CSS 스타일시트를 검사하기 이전에, (X)HTML 문법 검사를 하는 것을 권장합니다..
+  
주의: (X)HTML 문서에 포함된 CSS 스타일시트를 검사하기 이전에, (X)HTML 문법 검사를 하는 것을 권장합니다..
   
   
   

@@ -480,32 +480,15 @@
 
 

    

-     
+     
    
    

-   
-   
+   
+   
    
    
 
-    

-      Copyright © 1994-2009
-      W3C®
-
-      (MIT,
-      ERCIM,
-      Keio),
-      All Rights Reserved.
-      W3C liability,
-      trademark,
-      document use
-      and software licensing
-
-      rules apply. Your interactions with this site are in accordance
-      with our public and
-      Member privacy
-      statements.
-    
+   
Copyright © 2025 World Wide Web Consortium.
 W3C® liability, trademark and permissive license rules apply.
 
   
 
diff --git a/validator.html.nl b/validator.html.nl
index b5a2ded3a..96ab9fd8d 100644
--- a/validator.html.nl
+++ b/validator.html.nl
@@ -17,7 +17,7 @@
 
   
    

-    

+    

     CSS Validation Service
     

       Controleer Cascading Style Sheets (CSS) en (X)HTML documenten die gebruik maken van style sheets
@@ -30,7 +30,7 @@
       

 
       

-        
Valideer via een URI
+        
Valideer via een URI
         
         

           Geef de URI op van een document (HTML met CSS of alleen CSS) dat je wilt valideren:
@@ -124,7 +124,7 @@
       
 
       

-        
Valideer via het uploaden van een bestand
+        
Valideer via het uploaden van een bestand
       
         
Kies het document dat je wilt valideren:
         

@@ -214,7 +214,7 @@
       
 
       

-        
Valideer via directe invoer
+        
Valideer via directe invoer
         
         
Voer de CSS in die je wilt valideren:
         

@@ -314,10 +314,10 @@
       

   
 
   
-  

+  

 
   

-  
Opmerking: Als je een CSS style sheet wilt valideren die gebruikt wordt in een (X)HTML document, zou je die eerst moeten laten controleren.
+  
Opmerking: Als je een CSS style sheet wilt valideren die gebruikt wordt in een (X)HTML document, zou je die eerst moeten laten controleren.
   
   
   

@@ -480,32 +480,15 @@
 
 

    

-     
+     
    
    

-   
-   
+   
+   
    
    
 
-    

-      Copyright © 1994-2009
-      W3C®
-
-      (MIT,
-      ERCIM,
-      Keio),
-      All Rights Reserved.
-      W3C liability,
-      trademark,
-      document use
-      and software licensing
-
-      rules apply. Your interactions with this site are in accordance
-      with our public and
-      Member privacy
-      statements.
-    
+   
Copyright © 2025 World Wide Web Consortium.
 W3C® liability, trademark and permissive license rules apply.
 
   
 
diff --git a/validator.html.pl-PL b/validator.html.pl-PL
index f55a0ebc6..5956f7894 100644
--- a/validator.html.pl-PL
+++ b/validator.html.pl-PL
@@ -17,7 +17,7 @@
 
   
    

-    

+    

     CSS Validation Service
     

       Sprawdź Kaskadowe Arkusze Stylów CSS) i dokumenty (X)HTML z arkuszami stylów
@@ -30,7 +30,7 @@
       

 
       

-        
Walidacja przez URI
+        
Walidacja przez URI
         
         

           Wprowadź URI dokumentu (HTML z CSS lub tylko CSS) do walidacji  :
@@ -124,7 +124,7 @@
       
 
       

-        
Walidacja poprzez załadowanie pliku
+        
Walidacja poprzez załadowanie pliku
       
         
Wybierz dokument do walidacji:
         

@@ -214,7 +214,7 @@
       
 
       

-        
Walidacja poprzez bezpośrednie wprowadzenie kodu
+        
Walidacja poprzez bezpośrednie wprowadzenie kodu
         
         
Wprowadź kod CSS do walidacji:
         

@@ -314,10 +314,10 @@
       

   
 
   
-  

+  

 
   

-  
Uwaga: Jeśli chcesz walidować arkusz CSS umieszczony w dokumencie (X)HTML, powinieneś wpierw sprawdzić, czy użyty (X)HTML jest poprawny.
+  
Uwaga: Jeśli chcesz walidować arkusz CSS umieszczony w dokumencie (X)HTML, powinieneś wpierw sprawdzić, czy użyty (X)HTML jest poprawny.
   
   
   

@@ -480,32 +480,15 @@
 
 

    

-     
+     
    
    

-   
-   
+   
+   
    
    
 
-    

-      Copyright © 1994-2009
-      W3C®
-
-      (MIT,
-      ERCIM,
-      Keio),
-      All Rights Reserved.
-      W3C liability,
-      trademark,
-      document use
-      and software licensing
-
-      rules apply. Your interactions with this site are in accordance
-      with our public and
-      Member privacy
-      statements.
-    
+   
Copyright © 2025 World Wide Web Consortium.
 W3C® liability, trademark and permissive license rules apply.
 
   
 
diff --git a/validator.html.pt-BR b/validator.html.pt-BR
index 91c05adf4..f7000dcc8 100644
--- a/validator.html.pt-BR
+++ b/validator.html.pt-BR
@@ -17,7 +17,7 @@
 
   
    

-    

+    

     CSS Validation Service
     

       Analisa folhas de estilo em cascata (CSS) e documentos (X)HTML com folha de estilo
@@ -30,7 +30,7 @@
       

 
       

-        
Validar por URI
+        
Validar por URI
         
         

           Entre a URI do documento (HTML com CSS ou somente CSS) a ser validado:
@@ -124,7 +124,7 @@
       
 
       

-        
Validar por upload de arquivo
+        
Validar por upload de arquivo
       
         
Escolha o documento que você gostaria de validar:
         

@@ -214,7 +214,7 @@
       
 
       

-        
Validar por entrada direta
+        
Validar por entrada direta
         
         
Entre as CSS que você gostaria de validar:
         

@@ -314,10 +314,10 @@
       

   
 
   
-  

+  

 
   

-  
Nota: Para validar uma folha de estilo CSS incorporada a um documento (X)HTML você deverá, primeiramente, verificar se a marcação (X)HTML é válida.
+  
Nota: Para validar uma folha de estilo CSS incorporada a um documento (X)HTML você deverá, primeiramente, verificar se a marcação (X)HTML é válida.
   
   
   

@@ -480,32 +480,16 @@
 
 

    

-     
+     
    
    

-   
-   
+   
+   
    
    
 
-    

-      Copyright © 1994-2009
-      W3C®
+   
Copyright © 2025 World Wide Web Consortium.
 W3C® liability, trademark and permissive license rules apply.
 
-      (MIT,
-      ERCIM,
-      Keio),
-      All Rights Reserved.
-      W3C liability,
-      trademark,
-      document use
-      and software licensing
-
-      rules apply. Your interactions with this site are in accordance
-      with our public and
-      Member privacy
-      statements.
-    

 
   
 
diff --git a/validator.html.ro b/validator.html.ro
index ddd46dff6..c99280a8d 100644
--- a/validator.html.ro
+++ b/validator.html.ro
@@ -17,7 +17,7 @@
 
   
    

-    

+    

     CSS Validation Service
     

       Verfica foile de lucru in cascada(CSS) si documentele (X)HTML cu foi de stil
@@ -30,7 +30,7 @@
       

 
       

-        
Valideaza prin URI
+        
Valideaza prin URI
         
         

           Introdu URL-ul unui document (HTML cu CSS sau doar CSS) pe care vrei sa il validezi:
@@ -124,7 +124,7 @@
       
 
       

-        
Valideaza prin incarcare fisier
+        
Valideaza prin incarcare fisier
       
         
Alege documentul pe care vrei sa il validezi:
         

@@ -214,7 +214,7 @@
       
 
       

-        
Validare prin introducere directa a codului
+        
Validare prin introducere directa a codului
         
         
Introdu CSS-ul pe care vrei sa il validezi:
         

@@ -314,10 +314,10 @@
       

   
 
   
-  

+  

 
   

-  
Nota: Daca vrei sa validezi CSS-ul inclus intr-un document (X)HTML, ar trebui mai intai sa verifici daca documentul (X)HTML pe care il folosesti este valid.
+  
Nota: Daca vrei sa validezi CSS-ul inclus intr-un document (X)HTML, ar trebui mai intai sa verifici daca documentul (X)HTML pe care il folosesti este valid.
   
   
   

@@ -480,32 +480,15 @@
 
 

    

-     
+     
    
    

-   
-   
+   
+   
    
    
 
-    

-      Copyright © 1994-2009
-      W3C®
-
-      (MIT,
-      ERCIM,
-      Keio),
-      All Rights Reserved.
-      W3C liability,
-      trademark,
-      document use
-      and software licensing
-
-      rules apply. Your interactions with this site are in accordance
-      with our public and
-      Member privacy
-      statements.
-    
+   
Copyright © 2025 World Wide Web Consortium.
 W3C® liability, trademark and permissive license rules apply.
 
   
 
diff --git a/validator.html.ru b/validator.html.ru
index 2443ebe0a..75f57323e 100644
--- a/validator.html.ru
+++ b/validator.html.ru
@@ -17,7 +17,7 @@
 
   
    

-    

+    

     CSS Validation Service
     

       Проверка каскадных таблиц стилей (CSS) и документов (X)HTML с таблицами стилей
@@ -30,7 +30,7 @@
       

 
       

-        
Проверка по URI
+        
Проверка по URI
         
         

           Введите URI документа (HTML с CSS или только CSS) для проверки:
@@ -124,7 +124,7 @@
       
 
       

-        
Проверить загруженный файл
+        
Проверить загруженный файл
       
         
Выберите документ, который вы хотели бы проверить:
         

@@ -214,7 +214,7 @@
       
 
       

-        
Проверка набираемого текста
+        
Проверка набираемого текста
         
         
Введите код CSS, который вы хотели бы проверить на корректность:
         

@@ -314,10 +314,10 @@
       

   
 
   
-  

+  

 
   

-  
Примечание: Если вы хотите проверить каскадные таблицы стилей, встроенные в документ (X)HTML, вы должны сначала проверить на корректность сам документ (X)HTML.
+  
Примечание: Если вы хотите проверить каскадные таблицы стилей, встроенные в документ (X)HTML, вы должны сначала проверить на корректность сам документ (X)HTML.
   
   
   

@@ -480,32 +480,15 @@
 
 

    

-     
+     
    
    

-   
-   
+   
+   
    
    
 
-    

-      Copyright © 1994-2009
-      W3C®
-
-      (MIT,
-      ERCIM,
-      Keio),
-      All Rights Reserved.
-      W3C liability,
-      trademark,
-      document use
-      and software licensing
-
-      rules apply. Your interactions with this site are in accordance
-      with our public and
-      Member privacy
-      statements.
-    
+   
Copyright © 2025 World Wide Web Consortium.
 W3C® liability, trademark and permissive license rules apply.
 
   
 
diff --git a/validator.html.sv b/validator.html.sv
index f22c68721..7f57af0c0 100644
--- a/validator.html.sv
+++ b/validator.html.sv
@@ -17,7 +17,7 @@
 
   
    

-    

+    

     CSS Validation Service
     

       Granska Cascading Style Sheets (CSS) och (X)HTML-dokument med formatmallar
@@ -30,7 +30,7 @@
       

 
       

-        
Validera genom URI
+        
Validera genom URI
         
         

           Mata in URI för det dokument (HTML med CSS eller enbart CSS) som du vill validera:
@@ -124,7 +124,7 @@
       
 
       

-        
Validera genom att ladda upp fil
+        
Validera genom att ladda upp fil
       
         
Välj det dokument som du vill validera:
         

@@ -214,7 +214,7 @@
       
 
       

-        
Validera genom direkt inmatning
+        
Validera genom direkt inmatning
         
         
Mata in den CSS du vill validera:
         

@@ -314,10 +314,10 @@
       

   
 
   
-  

+  

 
   

-  
Märk: Om du vill validera din CSS-formatmall inbäddad i ett (X)HTML-dokument, så bör du först kontrollera att den (X)HTML du använder är giltig.
+  
Märk: Om du vill validera din CSS-formatmall inbäddad i ett (X)HTML-dokument, så bör du först kontrollera att den (X)HTML du använder är giltig.
   
   
   

@@ -480,32 +480,15 @@
 
 

    

-     
+     
    
    

-   
-   
+   
+   
    
    
 
-    

-      Copyright © 1994-2009
-      W3C®
-
-      (MIT,
-      ERCIM,
-      Keio),
-      All Rights Reserved.
-      W3C liability,
-      trademark,
-      document use
-      and software licensing
-
-      rules apply. Your interactions with this site are in accordance
-      with our public and
-      Member privacy
-      statements.
-    
+   
Copyright © 2025 World Wide Web Consortium.
 W3C® liability, trademark and permissive license rules apply.
 
   
 
diff --git a/validator.html.uk b/validator.html.uk
index 6f52e9ddb..c19eefa9b 100644
--- a/validator.html.uk
+++ b/validator.html.uk
@@ -17,7 +17,7 @@
 
   
    

-    

+    

     CSS Validation Service
     

       Перевірка каскадних таблиць стилів (CSS) та документів (X)HTML з таблицями стилів
@@ -30,7 +30,7 @@
       

 
       

-        
Перевірка по URI
+        
Перевірка по URI
         
         

           Уведіть  URI документу (HTML з CSS або лише CSS) для перевірки:
@@ -124,7 +124,7 @@
       
 
       

-        
Перевірити завантажений файл
+        
Перевірити завантажений файл
       
         
Оберіть документ, який ви хотіли б перевірити (лише CSS):
         

@@ -214,7 +214,7 @@
       
 
       

-        
Перевірка тексту, що набирається
+        
Перевірка тексту, що набирається
         
         
Уведіть код CSS, що ви хотіли б перевірити на коректність:
         

@@ -314,10 +314,10 @@
       

   
 
   
-  

+  

 
   

-  
Примітка: Якщо ви хочете перевірити каскадні таблиці стилів, вбудовані до документу (X)HTML, ви повинні спершу перевірити на коректність сам документ (X)HTML.
+  
Примітка: Якщо ви хочете перевірити каскадні таблиці стилів, вбудовані до документу (X)HTML, ви повинні спершу перевірити на коректність сам документ (X)HTML.
   
   
   

@@ -480,32 +480,16 @@
 
 

    

-     
+     
    
    

-   
-   
+   
+   
    
    
 
-    

-      Copyright © 1994-2009
-      W3C®
+   
Copyright © 2025 World Wide Web Consortium.
 W3C® liability, trademark and permissive license rules apply.
 
-      (MIT,
-      ERCIM,
-      Keio),
-      All Rights Reserved.
-      W3C liability,
-      trademark,
-      document use
-      and software licensing
-
-      rules apply. Your interactions with this site are in accordance
-      with our public and
-      Member privacy
-      statements.
-    

 
   
 
diff --git a/validator.html.zh-cn b/validator.html.zh-cn
index 7918b6c9c..f2a4b1dea 100644
--- a/validator.html.zh-cn
+++ b/validator.html.zh-cn
@@ -17,7 +17,7 @@
 
   
    

-    

+    

     CSS Validation Service
     

       检查层叠样式表(CSS)文档和HTML或者XHTML文档中的CSS内容
@@ -30,7 +30,7 @@
       

 
       

-        
验证指定URI的CSS内容
+        
验证指定URI的CSS内容
         
         

           输入你想验证的文档(带CSS的HTML文档或者CSS文档)的URI:
@@ -124,7 +124,7 @@
       
 
       

-        
验证上传文件
+        
验证上传文件
       
         
选择需要验证的文件:
         

@@ -214,7 +214,7 @@
       
 
       

-        
验证直接输入的内容
+        
验证直接输入的内容
         
         
输入你要验证的CSS代码:
         

@@ -314,10 +314,10 @@
       

   
 
   
-  

+  

 
   

-  
注意: 如果你想验证一段嵌入在HTML或者XHTML文档中的CSS，你首先要验证你的HTML或者XHTML文档是正确的。.
+  
注意: 如果你想验证一段嵌入在HTML或者XHTML文档中的CSS，你首先要验证你的HTML或者XHTML文档是正确的。.
   
   
   

@@ -480,32 +480,15 @@
 
 

    

-     
+     
    
    

-   
-   
+   
+   
    
    
 
-    

-      Copyright © 1994-2009
-      W3C®
-
-      (MIT,
-      ERCIM,
-      Keio),
-      All Rights Reserved.
-      W3C liability,
-      trademark,
-      document use
-      and software licensing
-
-      rules apply. Your interactions with this site are in accordance
-      with our public and
-      Member privacy
-      statements.
-    
+   
Copyright © 2025 World Wide Web Consortium.
 W3C® liability, trademark and permissive license rules apply.