diff --git a/intl/build/Makefile.in b/intl/build/Makefile.in index c593ab7d71c2..28c301a8ce6e 100644 --- a/intl/build/Makefile.in +++ b/intl/build/Makefile.in @@ -33,6 +33,9 @@ REQUIRES = xpcom \ unicharutil \ chardet \ uconv \ + lwbrk \ + intl \ + unicharutil \ htmlparser \ content \ widget \ @@ -46,10 +49,14 @@ CPPSRCS = \ LOCAL_INCLUDES = \ -I$(srcdir)/../chardet/src \ + -I$(srcdir)/../lwbrk/src \ + -I$(srcdir)/../unicharutil/src \ $(NULL) SHARED_LIBRARY_LIBS = \ $(DIST)/lib/$(LIB_PREFIX)chardet_s.$(LIB_SUFFIX) \ + $(DIST)/lib/$(LIB_PREFIX)lwbrk_s.$(LIB_SUFFIX) \ + $(DIST)/lib/$(LIB_PREFIX)ucharucomp_s.$(LIB_SUFFIX) \ $(NULL) EXTRA_DSO_LDOPTS = \ diff --git a/intl/build/nsI18nModule.cpp b/intl/build/nsI18nModule.cpp index 5117787775d4..7246d49e92db 100644 --- a/intl/build/nsI18nModule.cpp +++ b/intl/build/nsI18nModule.cpp @@ -42,51 +42,14 @@ #include "nsIServiceManager.h" // chardet -#include "nsMetaCharsetCID.h" -#include "nsICharsetDetector.h" -#include "nsICharsetAlias.h" -#include "nsMetaCharsetObserver.h" -#include "nsDocumentCharsetInfo.h" -#include "nsXMLEncodingObserver.h" -#include "nsICharsetDetectionAdaptor.h" -#include "nsICharsetDetectionObserver.h" -#include "nsDetectionAdaptor.h" -#include "nsIStringCharsetDetector.h" -#include "nsPSMDetectors.h" -#include "nsCyrillicDetector.h" -#include "nsDocumentCharsetInfoCID.h" -#include "nsXMLEncodingCID.h" -#include "nsCharsetDetectionAdaptorCID.h" - -// chardet -NS_GENERIC_FACTORY_CONSTRUCTOR(nsMetaCharsetObserver); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsDocumentCharsetInfo); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsXMLEncodingObserver); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsDetectionAdaptor); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsJAPSMDetector); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsJAStringPSMDetector); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsKOPSMDetector); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsKOStringPSMDetector); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsZHTWPSMDetector); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsZHTWStringPSMDetector); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsZHCNPSMDetector); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsZHCNStringPSMDetector); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsZHPSMDetector); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsZHStringPSMDetector); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsCJKPSMDetector); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsCJKStringPSMDetector); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsRUProbDetector); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsUKProbDetector); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsRUStringProbDetector); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsUKStringProbDetector); -#ifdef INCLUDE_DBGDETECTOR -NS_GENERIC_FACTORY_CONSTRUCTOR(ns1stBlkDbgDetector); -NS_GENERIC_FACTORY_CONSTRUCTOR(ns2ndBlkDbgDetector); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsLastBlkDbgDetector); -#endif /* INCLUDE_DBGDETECTOR */ - +#include "nsCharDetConstructors.h" +// lwbrk +#include "nsLWBrkConstructors.h" +// unicharutil +#include "nsUcharUtilConstructors.h" + static NS_METHOD AddCategoryEntry(const char* category, const char* key, @@ -306,9 +269,8 @@ static nsModuleComponentInfo components[] = NULL, NULL}, { "Probability based Ukrainian String Charset Detector", NS_UK_STRING_PROBDETECTOR_CID, NS_STRCDETECTOR_CONTRACTID_BASE "ukprob", nsUKStringProbDetectorConstructor, - NULL, NULL} + NULL, NULL}, #ifdef INCLUDE_DBGDETECTOR - , { "Debuging Detector 1st block", NS_1STBLKDBG_DETECTOR_CID, NS_CHARSET_DETECTOR_CONTRACTID_BASE "1stblkdbg", ns1stBlkDbgDetectorConstructor, NULL, NULL}, @@ -319,7 +281,19 @@ static nsModuleComponentInfo components[] = NS_CHARSET_DETECTOR_CONTRACTID_BASE "lastblkdbg", nsLastBlkDbgDetectorConstructor, NULL, NULL}, #endif /* INCLUDE_DBGDETECTOR */ - + // lwbrk + { "Line and Word Breaker", NS_LWBRK_CID, + NS_LWBRK_CONTRACTID, nsLWBreakerFImpConstructor}, + + // unicharutil + { "Unichar Utility", NS_UNICHARUTIL_CID, + NS_UNICHARUTIL_CONTRACTID, nsCaseConversionImp2Constructor}, + { "Unicode To Entity Converter", NS_ENTITYCONVERTER_CID, + NS_ENTITYCONVERTER_CONTRACTID, nsEntityConverterConstructor }, + { "Unicode To Charset Converter", NS_SAVEASCHARSET_CID, + NS_SAVEASCHARSET_CONTRACTID, nsSaveAsCharsetConstructor}, + { "Japanese Hankaku To Zenkaku", NS_HANKAKUTOZENKAKU_CID, + NS_HANKAKUTOZENKAKU_CONTRACTID, CreateNewHankakuToZenkaku}, }; diff --git a/intl/chardet/src/nsCharDetConstructors.h b/intl/chardet/src/nsCharDetConstructors.h new file mode 100644 index 000000000000..dcb78d7ead5d --- /dev/null +++ b/intl/chardet/src/nsCharDetConstructors.h @@ -0,0 +1,94 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: NPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Netscape Public 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/NPL/ + * + * 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 mozilla.org code. + * + * The Initial Developer of the Original Code is + * Netscape Communications Corporation. + * Portions created by the Initial Developer are Copyright (C) 1998 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * Pierre Phaneuf + * + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the NPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the NPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +/* + * Header file to be included by module - + * warning: defines a whole bunch of static functions + */ + +#ifndef nsCharDetConstructors_h__ +#define nsCharDetConstructors_h__ + +// chardet +#include "nsISupports.h" +#include "nsMetaCharsetCID.h" +#include "nsICharsetDetector.h" +#include "nsICharsetAlias.h" +#include "nsMetaCharsetObserver.h" +#include "nsDocumentCharsetInfo.h" +#include "nsXMLEncodingObserver.h" +#include "nsICharsetDetectionAdaptor.h" +#include "nsICharsetDetectionObserver.h" +#include "nsDetectionAdaptor.h" +#include "nsIStringCharsetDetector.h" +#include "nsPSMDetectors.h" +#include "nsCyrillicDetector.h" +#include "nsDocumentCharsetInfoCID.h" +#include "nsXMLEncodingCID.h" +#include "nsCharsetDetectionAdaptorCID.h" + +NS_GENERIC_FACTORY_CONSTRUCTOR(nsMetaCharsetObserver); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsDocumentCharsetInfo); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsXMLEncodingObserver); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsDetectionAdaptor); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsJAPSMDetector); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsJAStringPSMDetector); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsKOPSMDetector); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsKOStringPSMDetector); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsZHTWPSMDetector); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsZHTWStringPSMDetector); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsZHCNPSMDetector); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsZHCNStringPSMDetector); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsZHPSMDetector); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsZHStringPSMDetector); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsCJKPSMDetector); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsCJKStringPSMDetector); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsRUProbDetector); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUKProbDetector); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsRUStringProbDetector); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUKStringProbDetector); + +#ifdef INCLUDE_DBGDETECTOR +NS_GENERIC_FACTORY_CONSTRUCTOR(ns1stBlkDbgDetector); +NS_GENERIC_FACTORY_CONSTRUCTOR(ns2ndBlkDbgDetector); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsLastBlkDbgDetector); +#endif /* INCLUDE_DBGDETECTOR */ + + +#endif diff --git a/intl/lwbrk/src/nsLWBrkConstructors.h b/intl/lwbrk/src/nsLWBrkConstructors.h new file mode 100644 index 000000000000..998583c1302c --- /dev/null +++ b/intl/lwbrk/src/nsLWBrkConstructors.h @@ -0,0 +1,51 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: NPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Netscape Public 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/NPL/ + * + * 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 mozilla.org code. + * + * The Initial Developer of the Original Code is + * Netscape Communications Corporation. + * Portions created by the Initial Developer are Copyright (C) 1998 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the NPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the NPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +#ifndef nsLWBrkConstructors_h__ +#define nsLWBrkConstructors_h__ + +#include "nsLWBrkCIID.h" +#include "nsILineBreakerFactory.h" +#include "nsIWordBreakerFactory.h" +#include "nsLWBreakerFImp.h" +#include "nsLWBRKDll.h" + +NS_GENERIC_FACTORY_CONSTRUCTOR(nsLWBreakerFImp) + +#endif + diff --git a/intl/unicharutil/src/nsUcharUtilConstructors.h b/intl/unicharutil/src/nsUcharUtilConstructors.h new file mode 100644 index 000000000000..937586b3f62e --- /dev/null +++ b/intl/unicharutil/src/nsUcharUtilConstructors.h @@ -0,0 +1,88 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: NPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Netscape Public 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/NPL/ + * + * 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 mozilla.org code. + * + * The Initial Developer of the Original Code is + * Netscape Communications Corporation. + * Portions created by the Initial Developer are Copyright (C) 1998 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the NPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the NPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +#ifndef nsUcharUtilConstructors_h__ +#define nsUcharUtilConstructors_h__ + +#include "nsUnicharUtilCIID.h" +#include "nsCaseConversionImp2.h" +#include "nsHankakuToZenkakuCID.h" +#include "nsTextTransformFactory.h" +#include "nsICaseConversion.h" +#include "nsEntityConverter.h" +#include "nsSaveAsCharset.h" +#include "nsUUDll.h" +#include "nsFileSpec.h" +#include "nsIFile.h" + +// Functions used to create new instances of a given object by the +// generic factory. + +#define MAKE_CTOR(_name) \ +static NS_IMETHODIMP \ +CreateNew##_name(nsISupports* aOuter, REFNSIID aIID, void **aResult) \ +{ \ + if (!aResult) { \ + return NS_ERROR_INVALID_POINTER; \ + } \ + if (aOuter) { \ + *aResult = nsnull; \ + return NS_ERROR_NO_AGGREGATION; \ + } \ + nsISupports* inst; \ + nsresult rv = NS_New##_name(&inst); \ + if (NS_FAILED(rv)) { \ + *aResult = nsnull; \ + return rv; \ + } \ + rv = inst->QueryInterface(aIID, aResult); \ + if (NS_FAILED(rv)) { \ + *aResult = nsnull; \ + } \ + NS_RELEASE(inst); /* get rid of extra refcnt */ \ + return rv; \ +} + + +MAKE_CTOR(HankakuToZenkaku) + +NS_GENERIC_FACTORY_CONSTRUCTOR(nsCaseConversionImp2) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsEntityConverter) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsSaveAsCharset) + +#endif