diff --git a/mozilla/extensions/transformiix/source/xpath/FunctionLib.h b/mozilla/extensions/transformiix/source/xpath/FunctionLib.h index ccb61905360..eef2f6a2b67 100644 --- a/mozilla/extensions/transformiix/source/xpath/FunctionLib.h +++ b/mozilla/extensions/transformiix/source/xpath/FunctionLib.h @@ -3,28 +3,31 @@ * License Version 1.1 (the "License"); you may not use this file * except in compliance with the License. You may obtain a copy of * the License at http://www.mozilla.org/MPL/ - * + * * Software distributed under the License is distributed on an "AS * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is TransforMiiX XSLT processor. - * + * * The Initial Developer of the Original Code is The MITRE Corporation. * Portions created by MITRE are Copyright (C) 1999 The MITRE Corporation. * * Portions created by Keith Visco as a Non MITRE employee, * (C) 1999 Keith Visco. All Rights Reserved. - * - * Contributor(s): + * + * Contributor(s): * Keith Visco, kvisco@ziplink.net * -- original author. * * Olivier Gerardin, ogerardin@vo.lu * -- added number functions - * - * $Id: FunctionLib.h,v 1.5 2000-04-19 10:36:18 kvisco%ziplink.net Exp $ + * + * Marina Mechtcheriakova + * -- added support for lang function + * + * $Id: FunctionLib.h,v 1.6 2000-05-23 08:17:42 kvisco%ziplink.net Exp $ */ #include "TxString.h" @@ -53,6 +56,7 @@ static const String CONCAT_FN; static const String CONTAINS_FN; static const String COUNT_FN ; static const String FALSE_FN; +static const String LANG_FN; static const String LAST_FN; static const String LOCAL_NAME_FN; static const String NAME_FN; @@ -74,6 +78,7 @@ static const String CEILING_FN; static const String FLOOR_FN; // OG- + //-- internal XSL processor functions static const String ERROR_FN; @@ -111,7 +116,7 @@ class BooleanFunctionCall : public FunctionCall { public: - enum booleanFunctions { TX_BOOLEAN = 1, TX_FALSE, TX_NOT, TX_TRUE }; + enum booleanFunctions { TX_BOOLEAN = 1, TX_FALSE, TX_LANG, TX_NOT, TX_TRUE }; /** * Creates a default BooleanFunctionCall, which always evaluates to False diff --git a/mozilla/extensions/transformiix/source/xslt/Names.cpp b/mozilla/extensions/transformiix/source/xslt/Names.cpp index 4f43acb7777..fabd0670e52 100644 --- a/mozilla/extensions/transformiix/source/xslt/Names.cpp +++ b/mozilla/extensions/transformiix/source/xslt/Names.cpp @@ -26,15 +26,16 @@ * -- Removed the trailing "s" from FOLLOWING_SIBLING_AXIS, and * PRECEDING_SIBLING_AXIS to be compatible with the * W3C XPath 1.0 Recommendation + * -- Added lang attr declaration * - * $Id: Names.cpp,v 1.4 2000-04-19 10:32:35 kvisco%ziplink.net Exp $ + * $Id: Names.cpp,v 1.5 2000-05-23 08:13:03 kvisco%ziplink.net Exp $ */ /** * XSL names used throughout the XSLProcessor. * Probably should be wrapped in a Namespace * @author Keith Visco - * @version $Revision: 1.4 $ $Date: 2000-04-19 10:32:35 $ + * @version $Revision: 1.5 $ $Date: 2000-05-23 08:13:03 $ **/ #include "Names.h" @@ -92,6 +93,7 @@ const String FORMAT_ATTR = "format"; const String FROM_ATTR = "from"; const String HREF_ATTR = "href"; const String INDENT_ATTR = "indent"; +const String LANG_ATTR = "xml:lang"; const String LEVEL_ATTR = "level"; const String MATCH_ATTR = "match"; const String METHOD_ATTR = "method"; diff --git a/mozilla/extensions/transformiix/source/xslt/Names.h b/mozilla/extensions/transformiix/source/xslt/Names.h index a3b79a098c0..c5b05b822f3 100644 --- a/mozilla/extensions/transformiix/source/xslt/Names.h +++ b/mozilla/extensions/transformiix/source/xslt/Names.h @@ -3,25 +3,31 @@ * License Version 1.1 (the "License"); you may not use this file * except in compliance with the License. You may obtain a copy of * the License at http://www.mozilla.org/MPL/ - * + * * Software distributed under the License is distributed on an "AS * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is TransforMiiX XSLT processor. - * + * * The Initial Developer of the Original Code is The MITRE Corporation. * Portions created by MITRE are Copyright (C) 1999 The MITRE Corporation. * * Portions created by Keith Visco as a Non MITRE employee, * (C) 1999 Keith Visco. All Rights Reserved. - * - * Contributor(s): + * + * Contributor(s): * Keith Visco, kvisco@ziplink.net * -- original author. * - * $Id: Names.h,v 1.4 2000-04-19 10:32:20 kvisco%ziplink.net Exp $ + * Marina Mechtcheriakova, mmarina@mindspring.com + * -- Removed the trailing "s" from FOLLOWING_SIBLING_AXIS, and + * PRECEDING_SIBLING_AXIS to be compatible with the + * W3C XPath 1.0 Recommendation + * -- Added lang attr declaration + + * $Id: Names.h,v 1.5 2000-05-23 08:13:03 kvisco%ziplink.net Exp $ */ #include "TxString.h" @@ -83,6 +89,7 @@ extern const String FORMAT_ATTR; extern const String FROM_ATTR; extern const String HREF_ATTR; extern const String INDENT_ATTR; +extern const String LANG_ATTR; extern const String LEVEL_ATTR; extern const String MATCH_ATTR; extern const String MEDIA_TYPE_ATTR;