[Libreoffice-commits] .: Branch 'libreoffice-3-3' - patches/dev300
Kalman "" Szalai
kami911 at kemper.freedesktop.org
Thu Dec 16 03:37:18 PST 2010
patches/dev300/accessories_build.diff | 65
patches/dev300/accessories_target.diff | 71
patches/dev300/apply | 22
patches/dev300/extras_configure.diff | 99
patches/dev300/extras_fonts.diff | 11
patches/dev300/extras_solenv.diff | 14
patches/dev300/ooowikipedia_genericcommands.diff | 29
patches/dev300/ooowikipedia_toolbars.diff | 30
patches/dev300/ooowikipedia_writer.diff | 102
patches/dev300/premium-splitted-language-pack-solenv.diff | 25
patches/dev300/premium-splitted-packages.diff | 77
patches/dev300/scp2_accessories.diff | 4410 --------------
patches/dev300/scp2_build_accessories.diff | 10
patches/dev300/scp2_directory_accessories.diff | 199
patches/dev300/scp2_makefile_accessories.diff | 37
15 files changed, 5201 deletions(-)
New commits:
commit ac5836376bb96976c4dd5560115922b37d5ec493
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Thu Dec 16 12:36:09 2010 +0100
Remove integrated/outdated patches - OxygenOffice
diff --git a/patches/dev300/accessories_build.diff b/patches/dev300/accessories_build.diff
deleted file mode 100644
index dbb9950..0000000
--- a/patches/dev300/accessories_build.diff
+++ /dev/null
@@ -1,65 +0,0 @@
---- extras/prj/build.lst.eredeti 2006-12-01 15:23:25.000000000 +0100
-+++ extras/prj/build.lst 2007-12-24 14:50:16.000000000 +0100
-@@ -13,6 +13,62 @@
- er extras\source\gallery\sounds nmake - all er_gsnds NULL
- er extras\source\gallery\www-back nmake - all er_gwbck NULL
- er extras\source\gallery\www-graf nmake - all er_gwgrf NULL
-+er extras\source\gallery\accessories nmake - all er_gacce NULL
-+er extras\source\gallery\accessories\Draws\People nmake - all er_gadpe NULL
-+er extras\source\gallery\accessories\Photos\Buildings nmake - all er_gapbu NULL
-+er extras\source\gallery\accessories\Photos\Celebration nmake - all er_gapce NULL
-+er extras\source\gallery\accessories\Photos\Cities nmake - all er_gapci NULL
-+er extras\source\gallery\accessories\Photos\Fauna nmake - all er_gapfa NULL
-+er extras\source\gallery\accessories\Photos\Flowers nmake - all er_gapfl NULL
-+er extras\source\gallery\accessories\Photos\FoodsandDrinks nmake - all er_gapfo NULL
-+er extras\source\gallery\accessories\Photos\Humans nmake - all er_gaphu NULL
-+er extras\source\gallery\accessories\Photos\Landscapes nmake - all er_gapla NULL
-+er extras\source\gallery\accessories\Photos\Objects nmake - all er_gapob NULL
-+er extras\source\gallery\accessories\Photos\Plants nmake - all er_gappl NULL
-+er extras\source\gallery\accessories\Photos\Space nmake - all er_gapsp NULL
-+er extras\source\gallery\accessories\Photos\Statues nmake - all er_gapst NULL
-+er extras\source\gallery\accessories\Photos\Travel nmake - all er_gaptr NULL
-+er extras\source\premium\templates\layout\lang nmake - all er_prtela NULL
-+er extras\source\premium\templates\presnt\lang nmake - all er_prtepr NULL
-+er extras\source\premium\templates\educate\lang nmake - all er_prteed NULL
-+er extras\source\premium\templates\finance\lang nmake - all er_prtefi NULL
-+er extras\source\premium\templates\forms\lang nmake - all er_prtefo NULL
-+er extras\source\premium\templates\labels\lang nmake - all er_prtelb NULL
-+er extras\source\premium\templates\misc\lang nmake - all er_prtemi NULL
-+er extras\source\premium\templates\officorr\lang nmake - all er_prteoc NULL
-+er extras\source\premium\templates\offimisc\lang nmake - all er_prteom NULL
-+er extras\source\premium\templates\personal\lang nmake - all er_prtepe NULL
-+er extras\source\premium\templates\lang nmake - all er_prtemp NULL
-+er extras\source\premium\templates\common\layout nmake - all er_prtecola NULL
-+er extras\source\premium\templates\common\presnt nmake - all er_prtecopr NULL
-+er extras\source\premium\templates\common\educate nmake - all er_prtecoed NULL
-+er extras\source\premium\templates\common\finance nmake - all er_prtecofi NULL
-+er extras\source\premium\templates\common\forms nmake - all er_prtecofo NULL
-+er extras\source\premium\templates\common\labels nmake - all er_prtecolb NULL
-+er extras\source\premium\templates\common\misc nmake - all er_prtecomi NULL
-+er extras\source\premium\templates\common\officorr nmake - all er_prtecooc NULL
-+er extras\source\premium\templates\common\offimisc nmake - all er_prtecoom NULL
-+er extras\source\premium\templates\common\personal nmake - all er_prtecope NULL
-+er extras\source\premium\templates\common nmake - all er_prtecomp NULL
-+er extras\source\premium\samples\advertisement\lang nmake - all er_prsaad NULL
-+er extras\source\premium\samples\documentation\lang nmake - all er_prsedo NULL
-+er extras\source\premium\samples\lang nmake - all er_prsamp NULL
-+er extras\source\premium\templates-nonfree\layout\lang nmake - all er_prtelanf NULL
-+er extras\source\premium\templates-nonfree\presnt\lang nmake - all er_prteprnf NULL
-+er extras\source\premium\templates-nonfree\educate\lang nmake - all er_prteednf NULL
-+er extras\source\premium\templates-nonfree\finance\lang nmake - all er_prtefinf NULL
-+er extras\source\premium\templates-nonfree\forms\lang nmake - all er_prtefonf NULL
-+er extras\source\premium\templates-nonfree\labels\lang nmake - all er_prtelbnf NULL
-+er extras\source\premium\templates-nonfree\misc\lang nmake - all er_prteminf NULL
-+er extras\source\premium\templates-nonfree\officorr\lang nmake - all er_prteocnf NULL
-+er extras\source\premium\templates-nonfree\offimisc\lang nmake - all er_prteomnf NULL
-+er extras\source\premium\templates-nonfree\personal\lang nmake - all er_prtepenf NULL
-+er extras\source\premium\templates-nonfree\lang nmake - all er_prtempnf NULL
-+er extras\source\premium\samples-nonfree\advertisement\lang nmake - all er_prsaadnf NULL
-+er extras\source\premium\samples-nonfree\documentation\lang nmake - all er_prsedonf NULL
-+er extras\source\premium\samples-nonfree\lang nmake - all er_prsampnf NULL
-+er extras\source\gallery\accessories\Elements\Bullets2 nmake - all er_gaeb2 NULL
-+er extras\source\gallery\accessories-nonfree nmake - all er_gaccenf NULL
- er extras\source\misc_config nmake - all er_mcnf NULL
- er extras\source\palettes\lang nmake - all er_pall NULL
- er extras\source\palettes nmake - all er_palet NULL
diff --git a/patches/dev300/accessories_target.diff b/patches/dev300/accessories_target.diff
deleted file mode 100644
index 85af6f6..0000000
--- a/patches/dev300/accessories_target.diff
+++ /dev/null
@@ -1,71 +0,0 @@
---- extras/util/target.orig 2005-09-09 00:22:16.000000000 +0200
-+++ extras/util/target.pmk 2005-12-30 10:29:41.754670700 +0100
-@@ -76,6 +76,68 @@
- GALLERY_WWWBACK_TARGET = gallwwwback
- GALLERY_WWWGRAF_TARGET = gallwwwgraf
-
-+GALLERY_ACCESSORIES_ROOT_TARGET = kamigallery
-+GALLERY_ACCESSORIES_DRAWS_PEOPLE_TARGET = kamigallerydrawspeople
-+GALLERY_ACCESSORIES_PHOTOS_BUILDINGS_TARGET = kamigalleryphotosbuildings
-+GALLERY_ACCESSORIES_PHOTOS_CELEBRATION_TARGET = kamigalleryphotoscelebration
-+GALLERY_ACCESSORIES_PHOTOS_CITIES_TARGET = kamigalleryphotoscities
-+GALLERY_ACCESSORIES_PHOTOS_FAUNA_TARGET = kamigalleryphotosfauna
-+GALLERY_ACCESSORIES_PHOTOS_FLOWERS_TARGET = kamigalleryphotosflowers
-+GALLERY_ACCESSORIES_PHOTOS_FOODSANDDRINKS_TARGET = kamigalleryphotosfoodsanddrinks
-+GALLERY_ACCESSORIES_PHOTOS_HUMANS_TARGET = kamigalleryphotoshumans
-+GALLERY_ACCESSORIES_PHOTOS_LANDSCAPES_TARGET = kamigalleryphotoslandscapes
-+GALLERY_ACCESSORIES_PHOTOS_OBJECTS_TARGET = kamigalleryphotosobjects
-+GALLERY_ACCESSORIES_PHOTOS_PLANTS_TARGET = kamigalleryphotosplants
-+GALLERY_ACCESSORIES_PHOTOS_SPACE_TARGET = kamigalleryphotosspace
-+GALLERY_ACCESSORIES_PHOTOS_STATUES_TARGET = kamigalleryphotosstatues
-+GALLERY_ACCESSORIES_PHOTOS_TRAVEL_TARGET = kamigalleryphotostravel
-+GALLERY_ACCESSORIES_ELEMENTS_BULLETS2_TARGET = kamigalleryelementsbullets2
-+
-+GALLERY_ACCESSORIES_NONFREE_ROOT_TARGET = kamigallerynonfree
-+
-+PREMIUM_TEMPLATES_LAYOUT_IMPRESS_TARGET = kamitemplateslayout
-+PREMIUM_TEMPLATES_PRESNT_IMPRESS_TARGET = kamitemplatespresent
-+PREMIUM_TEMPLATES_EDUCATE_TARGET = kamitemplateseducate
-+PREMIUM_TEMPLATES_FINANCE_TARGET = kamitemplatesfinance
-+PREMIUM_TEMPLATES_FORMS_TARGET = kamitemplatesforms
-+PREMIUM_TEMPLATES_LABELS_TARGET = kamitemplateslabels
-+PREMIUM_TEMPLATES_MISC_TARGET = kamitemplatesmisc
-+PREMIUM_TEMPLATES_OFFICORR_TARGET = kamitemplatesofficorr
-+PREMIUM_TEMPLATES_OFFIMISC_TARGET = kamitemplatesoffimisc
-+PREMIUM_TEMPLATES_PERSONAL_TARGET = kamitemplatespersonal
-+PREMIUM_TEMPLATES_ROOT_TARGET = kamitemplates
-+
-+PREMIUM_TEMPLATES_COMMON_LAYOUT_IMPRESS_TARGET = kamitemplatescommonlayout
-+PREMIUM_TEMPLATES_COMMON_PRESNT_IMPRESS_TARGET = kamitemplatescommonpresent
-+PREMIUM_TEMPLATES_COMMON_EDUCATE_TARGET = kamitemplatescommoneducate
-+PREMIUM_TEMPLATES_COMMON_FINANCE_TARGET = kamitemplatescommonfinance
-+PREMIUM_TEMPLATES_COMMON_FORMS_TARGET = kamitemplatescommonforms
-+PREMIUM_TEMPLATES_COMMON_LABELS_TARGET = kamitemplatescommonlabels
-+PREMIUM_TEMPLATES_COMMON_MISC_TARGET = kamitemplatescommonmisc
-+PREMIUM_TEMPLATES_COMMON_OFFICORR_TARGET = kamitemplatescommonofficorr
-+PREMIUM_TEMPLATES_COMMON_OFFIMISC_TARGET = kamitemplatescommonoffimisc
-+PREMIUM_TEMPLATES_COMMON_PERSONAL_TARGET = kamitemplatescommonpersonal
-+PREMIUM_TEMPLATES_COMMON_ROOT_TARGET = kamitemplatescommon
-+
-+PREMIUM_SAMPLES_ROOT_TARGET = kamisamples
-+PREMIUM_SAMPLES_DOCUMENTATION_TARGET = kamisamplesdocumentation
-+PREMIUM_SAMPLES_ADVERTISEMENT_TARGET = kamisamplesadvertisement
-+
-+PREMIUM_TEMPLATES_NONFREE_LAYOUT_IMPRESS_TARGET = kamitemplatesnonfreelayout
-+PREMIUM_TEMPLATES_NONFREE_PRESNT_IMPRESS_TARGET = kamitemplatesnonfreepresent
-+PREMIUM_TEMPLATES_NONFREE_EDUCATE_TARGET = kamitemplatesnonfreeeducate
-+PREMIUM_TEMPLATES_NONFREE_FINANCE_TARGET = kamitemplatesnonfreefinance
-+PREMIUM_TEMPLATES_NONFREE_FORMS_TARGET = kamitemplatesnonfreeforms
-+PREMIUM_TEMPLATES_NONFREE_LABELS_TARGET = kamitemplatesnonfreelabels
-+PREMIUM_TEMPLATES_NONFREE_MISC_TARGET = kamitemplatesnonfreemisc
-+PREMIUM_TEMPLATES_NONFREE_OFFICORR_TARGET = kamitemplatesnonfreeofficorr
-+PREMIUM_TEMPLATES_NONFREE_OFFIMISC_TARGET = kamitemplatesnonfreeoffimisc
-+PREMIUM_TEMPLATES_NONFREE_PERSONAL_TARGET = kamitemplatesnonfreepersonal
-+PREMIUM_TEMPLATES_NONFREE_ROOT_TARGET = kamitemplatesnonfree
-+PREMIUM_SAMPLES_NONFREE_ROOT_TARGET = kamisamplesnonfree
-+PREMIUM_SAMPLES_NONFREE_DOCUMENTATION_TARGET = kamisamplesnonfreedocumentation
-+PREMIUM_SAMPLES_NONFREE_ADVERTISEMENT_TARGET = kamisamplesnonfreeadvertisement
-+
- INSO_DUTCH_TARGET = inso31
- INSO_ENGLISH_UK_TARGET = inso44
- INSO_ENGLISH_US_TARGET = inso01
diff --git a/patches/dev300/apply b/patches/dev300/apply
index e66f188..2488cf5 100755
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1829,25 +1829,7 @@ always-create-backups.diff
captionnumbering-hu.diff, i#110273, timar
[ OxygenOfficeExtras ]
-# Adding new items to extras module
-accessories_build.diff
-accessories_target.diff
-# Include new elements into scp2 module
-scp2_accessories.diff
-scp2_build_accessories.diff
-scp2_directory_accessories.diff
-scp2_makefile_accessories.diff
-
-# Splitting new contents into new packages
-premium-splitted-language-pack-solenv.diff
-premium-splitted-packages.diff
-
-# Add configure options
-extras_configure.diff
-# Add environment variables base on new configure switches
-extras_solenv.diff
extras_wizard.diff
-extras_fonts.diff
# Add our macros stuffs to wizard module
premium_macro_build.diff
premium_macro_dialog.diff
@@ -1857,10 +1839,6 @@ premium_macro_target.diff
helpdocument-genericcommand.diff
# Uniformize Help menu of us
helpdocument-menubar.diff
-# Adding OOoWikiPedia commands and DataMiner toolbars
-ooowikipedia_genericcommands.diff
-ooowikipedia_writer.diff
-ooowikipedia_toolbars.diff
[ OxygenOfficeWin32Only ]
# Update Windows installation of OpenOffice.org even the version is same
diff --git a/patches/dev300/extras_configure.diff b/patches/dev300/extras_configure.diff
deleted file mode 100644
index 8214f1f..0000000
--- a/patches/dev300/extras_configure.diff
+++ /dev/null
@@ -1,99 +0,0 @@
---- configure.in.org 2007-11-17 16:00:31.000000000 +0100
-+++ configure.in 2007-12-24 13:26:16.000000000 +0100
-@@ -681,6 +681,26 @@
- --with-oooblogger Download and integrate oooblogger extension.],
- ,)
-
-+AC_ARG_WITH(extra-gallery,
-+[ --with-extra-gallery Add extra gallery content of OxygenOffice Professional.
-+],,)
-+
-+AC_ARG_WITH(extra-template,
-+[ --with-extra-template Add extra temaplte content of OxygenOffice Professional.
-+],,)
-+
-+AC_ARG_WITH(extra-sample,
-+[ --with-extra-sample Add extra sample content of OxygenOffice Professional.
-+],,)
-+
-+AC_ARG_WITH(extra-font,
-+[ --with-extra-font Add extra font content of OxygenOffice Professional.
-+],,)
-+
-+AC_ARG_WITH(extra-accessory,
-+[ --with-extra-accessory Add extra accessory content of OxygenOffice Professional.
-+],,)
-+
- AC_ARG_ENABLE(verbose,
- [ --enable-verbose Increase build verbosity.
- --disable-verbose Decrease build verbosity.
-@@ -7468,6 +7488,69 @@
- AC_SUBST(VERBOSE)
-
- dnl ===================================================================
-+dnl Test whether to include extra gallery, template, sample, font
-+dnl ===================================================================
-+AC_MSG_CHECKING([whether to include extra gallery])
-+if test "$with_extra_gallery" = "yes" ; then
-+ AC_MSG_RESULT([yes])
-+ WITH_EXTRA_GALLERY=YES
-+ BUILD_TYPE="$BUILD_TYPE EXTRA_GALLERY"
-+else
-+ AC_MSG_RESULT([no])
-+ WITH_EXTRA_GALLERY=NO
-+ SCPDEFS="$SCPDEFS -DWITHOUT_EXTRA_GALLERY"
-+fi
-+AC_SUBST(WITH_EXTRA_GALLERY)
-+
-+AC_MSG_CHECKING([whether to include extra template])
-+if test "$with_extra_template" = "yes" ; then
-+ AC_MSG_RESULT([yes])
-+ WITH_EXTRA_TEMPLATE=YES
-+ BUILD_TYPE="$BUILD_TYPE EXTRA_TEMPLATE"
-+else
-+ AC_MSG_RESULT([no])
-+ WITH_EXTRA_TEMPLATE=NO
-+ SCPDEFS="$SCPDEFS -DWITHOUT_EXTRA_TEMPLATE"
-+fi
-+AC_SUBST(WITH_EXTRA_TEMPLATE)
-+
-+AC_MSG_CHECKING([whether to include extra sample])
-+if test "$with_extra_sample" = "yes" ; then
-+ AC_MSG_RESULT([yes])
-+ WITH_EXTRA_SAMPLE=YES
-+ BUILD_TYPE="$BUILD_TYPE EXTRA_SAMPLE"
-+else
-+ AC_MSG_RESULT([no])
-+ WITH_EXTRA_SAMPLE=NO
-+ SCPDEFS="$SCPDEFS -DWITHOUT_EXTRA_SAMPLE"
-+fi
-+AC_SUBST(WITH_EXTRA_SAMPLE)
-+
-+AC_MSG_CHECKING([whether to include extra font])
-+if test "$with_extra_font" = "yes" ; then
-+ AC_MSG_RESULT([yes])
-+ WITH_EXTRA_FONT=YES
-+ BUILD_TYPE="$BUILD_TYPE EXTRA_FONT"
-+else
-+ AC_MSG_RESULT([no])
-+ WITH_EXTRA_FONT=NO
-+ SCPDEFS="$SCPDEFS -DWITHOUT_EXTRA_FONT"
-+fi
-+AC_SUBST(WITH_EXTRA_FONT)
-+
-+AC_MSG_CHECKING([whether to include extra accessory])
-+if test "$with_extra_accessory" = "yes" ; then
-+ AC_MSG_RESULT([yes])
-+ WITH_EXTRA_ACCESSORY=YES
-+ BUILD_TYPE="$BUILD_TYPE EXTRA_ACCESSORY"
-+else
-+ AC_MSG_RESULT([no])
-+ WITH_EXTRA_ACCESSORY=NO
-+ SCPDEFS="$SCPDEFS -DWITHOUT_EXTRA_ACCESSORY"
-+fi
-+AC_SUBST(WITH_EXTRA_ACCESSORY)
-+
-+dnl ===================================================================
- dnl Hook up OOos nodep environmental variable to automake's equivalent
- dnl --enable-dependency-tracking configure option
- dnl ===================================================================
diff --git a/patches/dev300/extras_fonts.diff b/patches/dev300/extras_fonts.diff
deleted file mode 100644
index 275dc2f..0000000
--- a/patches/dev300/extras_fonts.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- extras/prj/d.lst.orig 2007-12-25 21:49:23.000000000 +0100
-+++ extras/prj/d.lst 2007-12-25 20:03:21.000000000 +0100
-@@ -9,5 +9,8 @@
- ..\%COMMON_OUTDIR%\bin\wordbook_en-US.zip %COMMON_DEST%\pck%_EXT%\wordbook_zh-CN.zip
- ..\%COMMON_OUTDIR%\bin\wordbook_en-US.zip %COMMON_DEST%\pck%_EXT%\wordbook_zh-TW.zip
- ..\source\truetype\symbol\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf
-+..\source\truetype\symbol\*.otf %COMMON_DEST%\pck%_EXT%\*.otf
-+..\source\truetype\decorative\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf
-+..\source\truetype\decorative\*.otf %COMMON_DEST%\pck%_EXT%\*.otf
- ..\source\shellnew\soffice.* %COMMON_DEST%\pck%_EXT%\soffice.*
- ..\unx\source\fonts\fonts.dir %COMMON_DEST%\pck%_EXT%\openoffice\fonts.dir
diff --git a/patches/dev300/extras_solenv.diff b/patches/dev300/extras_solenv.diff
deleted file mode 100644
index df222fe..0000000
--- a/patches/dev300/extras_solenv.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- set_soenv.in.orig 2007-12-24 14:28:24.000000000 +0100
-+++ set_soenv.in 2007-12-24 15:12:17.000000000 +0100
-@@ -2004,6 +2005,11 @@
- ToFile( "LIBXML_CFLAGS", "@LIBXML_CFLAGS@", "e" );
- ToFile( "LIBXML_LIBS", "@LIBXML_LIBS@", "e" );
- ToFile( "SYSTEM_EXPAT", "@SYSTEM_EXPAT@", "e" );
-+ToFile( "WITH_EXTRA_GALLERY", "@WITH_EXTRA_GALLERY@", "e" );
-+ToFile( "WITH_EXTRA_TEMPLATE", "@WITH_EXTRA_TEMPLATE@", "e" );
-+ToFile( "WITH_EXTRA_SAMPLE", "@WITH_EXTRA_SAMPLE@", "e" );
-+ToFile( "WITH_EXTRA_FONT", "@WITH_EXTRA_FONT@", "e" );
-+ToFile( "WITH_EXTRA_ACCESSORY", "@WITH_EXTRA_ACCESSORY@", "e" );
- ToFile( "SYSTEM_DB", "@SYSTEM_DB@", "e" );
- ToFile( "DB_VERSION", "@DB_VERSION@", "e" );
- ToFile( "DB_INCLUDES", "@DB_INCLUDES@", "e" );
diff --git a/patches/dev300/ooowikipedia_genericcommands.diff b/patches/dev300/ooowikipedia_genericcommands.diff
deleted file mode 100644
index 44d0998..0000000
--- a/patches/dev300/ooowikipedia_genericcommands.diff
+++ /dev/null
@@ -1,29 +0,0 @@
---- officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu.orig 2007-09-12 15:16:03.395713600 +0200
-+++ officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 2007-09-12 15:16:21.099065200 +0200
-@@ -5314,6 +5314,26 @@
- <value xml:lang="en-US">Current Language</value>
- </prop>
- </node>
-+ <node oor:name="macro:///OOoWikipedia.Module1.StarWithDefaultLanguage">
-+ <prop oor:name="Label" oor:type="xs:string">
-+ <value xml:lang="de">OOoWikipedia</value>
-+ <value xml:lang="en-US">OOoWikipedia</value>
-+ <value xml:lang="hu">OOoWikipedia</value>
-+ </prop>
-+ <prop oor:name="Properties" oor:type="xs:int">
-+ <value>1</value>
-+ </prop>
-+ </node>
-+ <node oor:name="macro:///OOoWikipedia.Module1.StartWithChooseBox">
-+ <prop oor:name="Label" oor:type="xs:string">
-+ <value xml:lang="de">OOoWikipedia - Idiom</value>
-+ <value xml:lang="en-US">OOoWikipedia - Language</value>
-+ <value xml:lang="hu">OOoWikipedia</value>
-+ </prop>
-+ <prop oor:name="Properties" oor:type="xs:int">
-+ <value>1</value>
-+ </prop>
-+ </node>
- <node oor:name=".uno:SetLanguageSelectionMenu" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">For Selection</value>
diff --git a/patches/dev300/ooowikipedia_toolbars.diff b/patches/dev300/ooowikipedia_toolbars.diff
deleted file mode 100644
index 533218d..0000000
--- a/patches/dev300/ooowikipedia_toolbars.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Naur -x .svn null/uiconfig/sglobal/toolbar/dataminer.xml sw/uiconfig/sglobal/toolbar/dataminer.xml
---- sw/uiconfig/sglobal/toolbar/dataminer.xml 1970-01-01 01:00:00.000000000 +0100
-+++ sw/uiconfig/sglobal/toolbar/dataminer.xml 2007-01-09 18:37:26.000000000 +0100
-@@ -0,0 +1,6 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd">
-+<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
-+ <toolbar:toolbaritem xlink:href="macro:///OOoWikipedia.Module1.StarWithDefaultLanguage" toolbar:text="WPD"/>
-+ <toolbar:toolbaritem xlink:href="macro:///OOoWikipedia.Module1.StartWithChooseBox" toolbar:text="WPC"/>
-+</toolbar:toolbar>
-diff -Naur -x .svn null/uiconfig/sweb/toolbar/dataminer.xml sw/uiconfig/sweb/toolbar/dataminer.xml
---- sw/uiconfig/sweb/toolbar/dataminer.xml 1970-01-01 01:00:00.000000000 +0100
-+++ sw/uiconfig/sweb/toolbar/dataminer.xml 2007-01-09 18:37:26.000000000 +0100
-@@ -0,0 +1,6 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd">
-+<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
-+ <toolbar:toolbaritem xlink:href="macro:///OOoWikipedia.Module1.StarWithDefaultLanguage" toolbar:text="WPD"/>
-+ <toolbar:toolbaritem xlink:href="macro:///OOoWikipedia.Module1.StartWithChooseBox" toolbar:text="WPC"/>
-+</toolbar:toolbar>
-diff -Naur -x .svn null/uiconfig/swriter/toolbar/dataminer.xml sw/uiconfig/swriter/toolbar/dataminer.xml
---- sw/uiconfig/swriter/toolbar/dataminer.xml 1970-01-01 01:00:00.000000000 +0100
-+++ sw/uiconfig/swriter/toolbar/dataminer.xml 2007-01-09 18:37:26.000000000 +0100
-@@ -0,0 +1,6 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd">
-+<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
-+ <toolbar:toolbaritem xlink:href="macro:///OOoWikipedia.Module1.StarWithDefaultLanguage" toolbar:text="WPD"/>
-+ <toolbar:toolbaritem xlink:href="macro:///OOoWikipedia.Module1.StartWithChooseBox" toolbar:text="WPC"/>
-+</toolbar:toolbar>
diff --git a/patches/dev300/ooowikipedia_writer.diff b/patches/dev300/ooowikipedia_writer.diff
deleted file mode 100644
index 62963d4..0000000
--- a/patches/dev300/ooowikipedia_writer.diff
+++ /dev/null
@@ -1,102 +0,0 @@
---- officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu.orig 2007-08-10 19:12:58.000000000 +0200
-+++ officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu 2007-09-12 15:16:21.239692000 +0200
-@@ -651,6 +651,31 @@
- <value>true</value>
- </prop>
- </node>
-+ <node oor:name="private:resource/toolbar/dataminer" oor:op="replace">
-+ <prop oor:name="DockPos" oor:type="xs:string">
-+ <value>1,1</value>
-+ </prop>
-+ <prop oor:name="Docked" oor:type="xs:boolean">
-+ <value>true</value>
-+ </prop>
-+ <prop oor:name="DockingArea" oor:type="xs:int">
-+ <value>0</value>
-+ </prop>
-+ <prop oor:name="UIName" oor:type="xs:string">
-+ <value xml:lang="en-US">Dataminer</value>
-+ <value xml:lang="de">Angabe Knappe</value>
-+ <value xml:lang="hu">Adatbányász</value>
-+ </prop>
-+ <prop oor:name="Visible" oor:type="xs:boolean">
-+ <value>true</value>
-+ </prop>
-+ <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
-+ <value>false</value>
-+ </prop>
-+ <prop oor:name="ContextSensitive" oor:type="xs:boolean">
-+ <value>false</value>
-+ </prop>
-+ </node>
- </node>
- </node>
- </oor:component-data>
---- officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu.orig 2007-08-10 19:12:58.000000000 +0200
-+++ officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu 2007-09-12 15:16:21.255317200 +0200
-@@ -581,6 +581,31 @@
- <value>true</value>
- </prop>
- </node>
-+ <node oor:name="private:resource/toolbar/dataminer" oor:op="replace">
-+ <prop oor:name="DockPos" oor:type="xs:string">
-+ <value>1,1</value>
-+ </prop>
-+ <prop oor:name="Docked" oor:type="xs:boolean">
-+ <value>true</value>
-+ </prop>
-+ <prop oor:name="DockingArea" oor:type="xs:int">
-+ <value>0</value>
-+ </prop>
-+ <prop oor:name="UIName" oor:type="xs:string">
-+ <value xml:lang="en-US">Dataminer</value>
-+ <value xml:lang="de">Angabe Knappe</value>
-+ <value xml:lang="hu">Adatbányász</value>
-+ </prop>
-+ <prop oor:name="Visible" oor:type="xs:boolean">
-+ <value>true</value>
-+ </prop>
-+ <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
-+ <value>false</value>
-+ </prop>
-+ <prop oor:name="ContextSensitive" oor:type="xs:boolean">
-+ <value>false</value>
-+ </prop>
-+ </node>
- </node>
- </node>
- </oor:component-data>
---- officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu.orig 2007-08-10 19:12:58.000000000 +0200
-+++ officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu 2007-09-12 15:16:21.286567600 +0200
-@@ -657,6 +657,31 @@
- <value>true</value>
- </prop>
- </node>
-+ <node oor:name="private:resource/toolbar/dataminer" oor:op="replace">
-+ <prop oor:name="DockPos" oor:type="xs:string">
-+ <value>1,1</value>
-+ </prop>
-+ <prop oor:name="Docked" oor:type="xs:boolean">
-+ <value>true</value>
-+ </prop>
-+ <prop oor:name="DockingArea" oor:type="xs:int">
-+ <value>0</value>
-+ </prop>
-+ <prop oor:name="UIName" oor:type="xs:string">
-+ <value xml:lang="en-US">Dataminer</value>
-+ <value xml:lang="de">Angabe Knappe</value>
-+ <value xml:lang="hu">Adatbányász</value>
-+ </prop>
-+ <prop oor:name="Visible" oor:type="xs:boolean">
-+ <value>true</value>
-+ </prop>
-+ <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
-+ <value>false</value>
-+ </prop>
-+ <prop oor:name="ContextSensitive" oor:type="xs:boolean">
-+ <value>false</value>
-+ </prop>
-+ </node>
- </node>
- </node>
- </oor:component-data>
diff --git a/patches/dev300/premium-splitted-language-pack-solenv.diff b/patches/dev300/premium-splitted-language-pack-solenv.diff
deleted file mode 100644
index 6055957..0000000
--- a/patches/dev300/premium-splitted-language-pack-solenv.diff
+++ /dev/null
@@ -1,25 +0,0 @@
---- solenv/bin/modules/installer/languagepack.pm.orig 2008-03-25 00:19:45.000000000 +0100
-+++ solenv/bin/modules/installer/languagepack.pm 2008-03-23 15:36:44.000000000 +0100
-@@ -98,6 +98,11 @@
- # if ( $oneitem->{'Dir'} eq "gid_Dir_Fonts_Truetype" ) { $oneitem->{'modules'} = "gid_Module_Langpack_Fonts_$locallang"; }
- # if ( $oneitem->{'Dir'} eq "gid_Dir_Resource" ) { $oneitem->{'modules'} = "gid_Module_Langpack_Resource_$locallang"; }
- # if ( $oneitem->{'Dir'} eq "gid_Dir_Help_Isolanguage" ) { $oneitem->{'modules'} = "gid_Module_Langpack_Help_$locallang"; }
-+# if (( $oneitem->{'Dir'} eq "gid_Dir_Samples_Language") || ($oneitem->{'Dir'} eq "gid_Dir_Samples_Drawings") || ($oneitem->{'Dir'} eq "gid_Dir_Samples_Formulas") || ($oneitem->{'Dir'} eq "gid_Dir_Samples_Presentations") || ($oneitem->{'Dir'} eq "gid_Dir_Samples_Spreadsheets") || ($oneitem->{'Dir'} eq "gid_Dir_Samples_Texts") || ($oneitem->{'Dir'} eq "gid_Dir_Samples_Texts_Kapitel") || ($oneitem->{'Dir'} eq "gid_Dir_Samples_Databases") || ($oneitem->{'Dir'} eq "gid_Dir_Samples_Databases_Dateien")) { $oneitem->{'modules'} = "gid_Module_Optional_Accessories_Samples_$locallang"; }
-+# if (( $oneitem->{'Dir'} eq "gid_Dir_Template_Language") || ($oneitem->{'Dir'} eq "gid_Dir_Template_Educate") || ($oneitem->{'Dir'} eq "gid_Dir_Template_Finance") || ($oneitem->{'Dir'} eq "gid_Dir_Template_Forms") || ($oneitem->{'Dir'} eq "gid_Dir_Template_Labels") || ($oneitem->{'Dir'} eq "gid_Dir_Template_Layout") || ($oneitem->{'Dir'} eq "gid_Dir_Template_Misc") || ($oneitem->{'Dir'} eq "gid_Dir_Template_Officorr") || ($oneitem->{'Dir'} eq "id_Dir_Template_Offimisc") || ($oneitem->{'Dir'} eq "gid_Dir_Template_Personal") || ($oneitem->{'Dir'} eq "gid_Dir_Template_Presnt" )) { $oneitem->{'modules'} = "gid_Module_Optional_Accessories_Templates_$locallang"; }
-+# if ( $oneitem->{'Dir'} eq "gid_Dir_Samples_Documentations" ) { $oneitem->{'modules'} = "gid_Module_Optional_Accessories_Documentations_$locallang"; }
-+# if ( $oneitem->{'Dir'} eq "gid_Dir_Samples_Advertisement" ) { $oneitem->{'modules'} = "gid_Module_Optional_Accessories_Advertisement_$locallang"; }
-+#
- # }
- # }
-
-@@ -204,6 +209,10 @@
- # if ( ${$alldirs}[$i] =~ /-fonts/ ) { next; }
- # if ( ${$alldirs}[$i] =~ /-help/ ) { next; }
- # if ( ${$alldirs}[$i] =~ /-res/ ) { next; }
-+# if ( ${$alldirs}[$i] =~ /-extra-samples/ ) { next; }
-+# if ( ${$alldirs}[$i] =~ /-extra-templates/ ) { next; }
-+# if ( ${$alldirs}[$i] =~ /-extra-documentations/ ) { next; }
-+# if ( ${$alldirs}[$i] =~ /-extra-advertisement/ ) { next; }
- #
- # $packagename = ${$alldirs}[$i];
- # last;
diff --git a/patches/dev300/premium-splitted-packages.diff b/patches/dev300/premium-splitted-packages.diff
deleted file mode 100644
index eacc4b4..0000000
--- a/patches/dev300/premium-splitted-packages.diff
+++ /dev/null
@@ -1,77 +0,0 @@
---- setup_native/source/packinfo/packinfo_accessories.txt.orig 2008-03-25 00:12:39.000000000 +0100
-+++ setup_native/source/packinfo/packinfo_accessories.txt 2008-03-23 15:00:51.000000000 +0100
-@@ -0,0 +1,74 @@
-+# Format:
-+
-+# Start
-+# scpModule
-+# shellscript file (optional)
-+# solarispackagename
-+# solarisrequires (optional)
-+# solarisprovides (optional)
-+# packagename
-+# linuxreplaces (optional)
-+# requires (optional)
-+# provides (optional)
-+# copyright
-+# vendor
-+# description
-+# destpath
-+# End
-+
-+# Package definitions for OxygenOffice Professional
-+# 1/3 Gallery
-+
-+Start
-+module = "gid_Module_Optional_Accessories_Gallery"
-+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extra-gallery"
-+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07"
-+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extra-gallery"
-+requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
-+freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
-+copyright = "1999-2008 by %PRODUCTNAME"
-+solariscopyright = "solariscopyrightfile"
-+vendor = "%PRODUCTNAME"
-+description = "Extra gallery for %PRODUCTNAME %PRODUCTVERSION"
-+destpath = "/opt"
-+packageversion = "%OOOPACKAGEVERSION"
-+End
-+
-+# 2/3 Fonts
-+
-+Start
-+module = "gid_Module_Optional_Accessories_Fonts"
-+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extra-fonts"
-+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07"
-+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extra-fonts"
-+requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
-+freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
-+copyright = "1999-2008 by %PRODUCTNAME"
-+solariscopyright = "solariscopyrightfile"
-+vendor = "%PRODUCTNAME"
-+description = "Extra fonts for %PRODUCTNAME %PRODUCTVERSION"
-+destpath = "/opt"
-+packageversion = "%OOOPACKAGEVERSION"
-+End
-+
-+# 3/3 Templates - Common
-+
-+Start
-+module = "gid_Module_Optional_Accessories_Tem_Common"
-+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extra-templates-common"
-+solarisrequires = %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07"
-+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extra-templates-common"
-+requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
-+freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
-+copyright = "1999-2008 by %PRODUCTNAME"
-+solariscopyright = "solariscopyrightfile"
-+vendor = "%PRODUCTNAME"
-+description = "Extra Common Templates for %PRODUCTNAME %PRODUCTVERSION"
-+destpath = "/opt"
-+packageversion = "%OOOPACKAGEVERSION"
-+End
-+
-+
-+# END OF Package definitions for OxygenOffice Professional
-+
-+
diff --git a/patches/dev300/scp2_accessories.diff b/patches/dev300/scp2_accessories.diff
deleted file mode 100644
index ac37af7..0000000
--- a/patches/dev300/scp2_accessories.diff
+++ /dev/null
@@ -1,4410 +0,0 @@
-diff -Naur scp2.old/source/accessories/file_accessories.scp scp2/source/accessories/file_accessories.scp
---- scp2.old/source/accessories/file_accessories.scp 1970-01-01 01:00:00.000000000 +0100
-+++ scp2/source/accessories/file_accessories.scp 2008-12-15 10:19:15.000000000 +0100
-@@ -0,0 +1,55 @@
-+/*************************************************************************
-+*
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: file_accessories.scp,v $
-+ *
-+ * $Revision: 1.0 $
-+ *
-+ * last change: $Author: KAMI $ $Date: 2006/07/02 14:50:39 $
-+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, as published by the Free Software Foundation.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ *
-+************************************************************************/
-+
-+#include "macros.inc"
-+
-+/* *** KAMI Extras *** */
-+
-+/* ** Macro - Premium ** */
-+
-+File gid_File_Basic_Premium
-+ Dir = gid_Dir_Basic_Premium;
-+ ARCHIVE_TXT_FILE_BODY_PATCH;
-+ Name = "basicsrvpremium.zip";
-+End
-+
-+/* ** Macro - OOoWikipedia ** */
-+
-+File gid_File_Basic_OOoWikipedia
-+ Dir = gid_Dir_Basic_OOoWikipedia;
-+ ARCHIVE_TXT_FILE_BODY_PATCH;
-+ Name = "basicsrvooowikipedia.zip";
-+End
-+
-diff -Naur scp2.old/source/accessories/file_font_accessories.scp scp2/source/accessories/file_font_accessories.scp
---- scp2.old/source/accessories/file_font_accessories.scp 1970-01-01 01:00:00.000000000 +0100
-+++ scp2/source/accessories/file_font_accessories.scp 2008-12-15 10:19:15.000000000 +0100
-@@ -0,0 +1,908 @@
-+/*************************************************************************
-+*
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: file_font_accessories.scp,v $
-+ *
-+ * $Revision: 1.0 $
-+ *
-+ * last change: $Author: KAMI $ $Date: 2006/02/18 14:50:39 $
-+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, as published by the Free Software Foundation.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ *
-+************************************************************************/
-+
-+#include "macros.inc"
-+
-+/* Airmole font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_airmole, airmole.ttf, Airmole )
-+#endif
-+
-+/* Airmole Antique font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_airmolea, airmolea.ttf, Airmole Antique )
-+#endif
-+
-+/* Airmole Shaded font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_airmoles, airmoles.ttf, Airmole Shaded )
-+#endif
-+
-+/* Airmole Stripe font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_airmoleq, airmoleq.ttf, Airmole Stripe )
-+#endif
-+
-+/* Astron Boy font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_astronbo, astronbo.ttf, Astron Boy )
-+#endif
-+
-+/* Astron Boy Italic font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_astronbi, astronbi.ttf, Astron Boy Italic )
-+#endif
-+
-+/* Astron Boy Video font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_astronbv, astronbv.ttf, Astron Boy Video )
-+#endif
-+
-+/* Astron Boy Wonder font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_astronbw, astronbw.ttf, Astron Boy Wonder )
-+#endif
-+
-+/* Baveuse font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_baveuse, baveuse.ttf, Baveuse )
-+#endif
-+
-+/* Berylium font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_Berylium, Berylium.ttf, Berylium )
-+#endif
-+
-+/* Berylium Bold font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_Beryliub, Beryliub.ttf, Berylium Bold )
-+#endif
-+
-+/* Berylium Bold Italic font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_Berylibi, Berylibi.ttf, Berylium Bold Italic )
-+#endif
-+
-+/* Berylium Italic font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_Beryliui, Beryliui.ttf, Berylium Italic )
-+#endif
-+
-+/* Betsy Flanagan 2 font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_BETSY2, BETSY2.ttf, Betsy Flanagan 2 )
-+#endif
-+
-+/* Blue Highway font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_bluehigh, bluehigh.ttf, Blue Highway )
-+#endif
-+
-+/* Blue Highway Bold font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_bluebold, bluebold.ttf, Blue Highway Bold )
-+#endif
-+
-+/* Blue Highway Condensed font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_bluecond, bluecond.ttf, Blue Highway Condensed )
-+#endif
-+
-+/* Blue Highway Linocut font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_bluehigl, bluehigl.ttf, Blue Highway Linocut )
-+#endif
-+
-+/* Bullpen font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_bullpen_, bullpen_.ttf, Bullpen )
-+#endif
-+
-+/* Bullpen 3D font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_bullpen3, bullpen3.ttf, Bullpen 3D )
-+#endif
-+
-+/* Bullpen Italic font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_bullpeni, bullpeni.ttf, Bullpen Italic )
-+#endif
-+
-+/* Colourbars font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_colourba, colourba.ttf, Colourbars )
-+#endif
-+
-+/* Colourbars Bold font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_colourbb, colourbb.ttf, Colourbars Bold )
-+#endif
-+
-+/* Counterscraps font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_counters, counters.ttf, Counterscraps )
-+#endif
-+
-+/* Credit Valley font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_creditva, creditva.ttf, Credit Valley )
-+#endif
-+
-+/* Credit Valley Bold font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_creditvb, creditvb.ttf, Credit Valley Bold )
-+#endif
-+
-+/* Credit Valley Bold Italic font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_creditvz, creditvz.ttf, Credit Valley Bold Italic )
-+#endif
-+
-+/* Credit Valley Italic font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_creditvi, creditvi.ttf, Credit Valley Italic )
-+#endif
-+
-+/* Edmunds font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_edmunds, edmunds.ttf, Edmunds )
-+#endif
-+
-+/* Edmunds Distressed font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_edmundis, edmundis.ttf, Edmunds Distressed )
-+#endif
-+
-+/* Engebrechtre font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_engeregu, engeregu.ttf, Engebrechtre )
-+#endif
-+
-+/* Engebrechtre Bold font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_engebold, engebold.ttf, Engebrechtre Bold )
-+#endif
-+
-+/* Engebrechtre Bold Italic font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_engeboit, engeboit.ttf, Engebrechtre Bold Italic )
-+#endif
-+
-+/* Engebrechtre Expanded font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_engeexpa, engeexpa.ttf, Engebrechtre Expanded )
-+#endif
-+
-+/* Engebrechtre Expanded Bold font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_engeexbo, engeexbo.ttf, Engebrechtre Expanded Bold )
-+#endif
-+
-+/* Engebrechtre Expanded Bold Italic font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_engeexbi, engeexbi.ttf, Engebrechtre Expanded Bold Italic )
-+#endif
-+
-+/* Engebrechtre Expanded Italic font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_engeexit, engeexit.ttf, Engebrechtre Expanded Italic )
-+#endif
-+
-+/* Engebrechtre Italic font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_engeital, engeital.ttf, Engebrechtre Italic )
-+#endif
-+
-+/* Goodfish font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_goodfish, goodfish.ttf, Goodfish )
-+#endif
-+
-+/* Goodfish Bold font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_goodfisb, goodfisb.ttf, Goodfish Bold )
-+#endif
-+
-+/* Goodfish Bold Italic font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_goodfisc, goodfisc.ttf, Goodfish Bold Italic )
-+#endif
-+
-+/* Goodfish Italic font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_goodfisi, goodfisi.ttf, Goodfish Italic )
-+#endif
-+
-+/* Guanine font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_guanine_, guanine_.ttf, Guanine )
-+#endif
-+
-+/* Gunplay font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_gunplay, gunplay.ttf, Gunplay )
-+#endif
-+
-+/* Kirsty font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_kirsty__, kirsty__.ttf, Kirsty )
-+#endif
-+
-+/* Kirsty Bold font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_kirsty_b, kirsty_b.ttf, Kirsty Bold )
-+#endif
-+
-+/* Kirsty Bold Italic font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_kirstybi, kirstybi.ttf, Kirsty Bold Italic )
-+#endif
-+
-+/* Kirsty Italic font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_kirsty_i, kirsty_i.ttf, Kirsty Italic )
-+#endif
-+
-+/* Kirsty Ink font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_kirstyin, kirstyin.ttf, Kirsty Ink )
-+#endif
-+
-+/* Mufferaw font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_mufferaw, mufferaw.ttf, Mufferaw )
-+#endif
-+
-+/* Nasalization font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_nasaliza, nasaliza.ttf, Nasalization )
-+#endif
-+
-+/* Neuropol font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_NEUROPOL, NEUROPOL.ttf, Neuropol )
-+#endif
-+
-+/* Numberpile font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_numberpi, numberpi.ttf, Numberpile )
-+#endif
-+
-+/* Pricedown font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_pricedow, pricedow.ttf, Pricedown )
-+#endif
-+
-+/* Pupcat font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_pupcat__, pupcat__.ttf, Pupcat )
-+#endif
-+
-+/* Rina font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_rina, rina.ttf, Rina )
-+#endif
-+
-+/* Sandoval font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_sandoval, sandoval.ttf, Sandoval )
-+#endif
-+
-+/* Sappy Mugs font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_SAPPM___, SAPPM___.ttf, Sappy Mugs )
-+#endif
-+
-+/* Screengem font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_screenge, screenge.ttf, Screengem )
-+#endif
-+
-+/* Steelfish font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_steelfis, steelfis.ttf, Steelfish )
-+#endif
-+
-+/* Steelfish Bold font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_steelfib, steelfib.ttf, Steelfish Bold )
-+#endif
-+
-+/* Steelfish Outline font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_steelout, steelout.ttf, Steelfish Outline )
-+#endif
-+
-+/* Strenuous font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_strenuou, strenuou.ttf, Strenuous )
-+#endif
-+
-+/* Strenuous 3D font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_strenu3d, strenu3d.ttf, Strenuous 3D )
-+#endif
-+
-+/* Subpear font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_subpear_, subpear_.ttf, Subpear )
-+#endif
-+
-+/* Teen font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_teen____, teen____.ttf, Teen )
-+#endif
-+
-+/* Teen Bold font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_teenbold, teenbold.ttf, Teen Bold )
-+#endif
-+
-+/* Teen Bold Italic font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_teenbdit, teenbdit.ttf, Teen Bold Italic )
-+#endif
-+
-+/* Teen Italic font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_teenital, teenital.ttf, Teen Italic )
-+#endif
-+
-+/* Teen Light font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_teenlite, teenlite.ttf, Teen Light )
-+#endif
-+
-+/* Teen Light Italic font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_teenlita, teenlita.ttf, Teen Light Italic )
-+#endif
-+
-+/* Typodermic font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_typoderm, typoderm.ttf, Typodermic )
-+#endif
-+
-+/* Vahika font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_vahika_, vahika_.ttf, Vahika )
-+#endif
-+
-+/* Vahika Bold font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_vahikab, vahikab.ttf, Vahika Bold )
-+#endif
-+
-+/* Vahika Bold Italic font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_vahikac, vahikac.ttf, Vahika Bold Italic )
-+#endif
-+
-+/* Vahika Italic font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_vahikai, vahikai.ttf, Vahika Italic )
-+#endif
-+
-+/* Vectroid font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_vectroid, vectroid.ttf, Vectroid )
-+#endif
-+
-+/* Velvenda Cooler font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_velvendc, velvendc.ttf, Velvenda Cooler )
-+#endif
-+
-+/* Velvenda Megablack font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_velvenda, velvenda.ttf, Velvenda Megablack )
-+#endif
-+
-+/* Vibrocentric font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_vibrocen, vibrocen.ttf, Vibrocentric )
-+#endif
-+
-+/* Vibrocentric Bold font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_vibroceb, vibroceb.ttf, Vibrocentric Bold )
-+#endif
-+
-+/* Vibrocentric Bold Italic font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_vibrocex, vibrocex.ttf, Vibrocentric Bold Italic )
-+#endif
-+
-+/* Vibrocentric Italic font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_vibrocei, vibrocei.ttf, Vibrocentric Italic )
-+#endif
-+
-+/* Wintermute font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_wintermu, wintermu.ttf, Wintermute )
-+#endif
-+
-+/* You're Gone font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_youregon, youregon.ttf, You are Gone )
-+#endif
-+
-+/* You're Gone Italic font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_youregoi, youregoi.ttf, You are Gone Italic )
-+#endif
-+
-+/* Zekton font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_zekton__, zekton__.ttf, Zekton )
-+#endif
-+
-+/* Zekton Bold font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_zektonbo, zektonbo.ttf, Zekton Bold )
-+#endif
-+
-+/* Zekton Bold Italic font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_zektonbi, zektonbi.ttf, Zekton Bold Italic )
-+#endif
-+
-+/* Zekton Italic font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_zektonit, zektonit.ttf, Zekton Italic )
-+#endif
-+
-+/* Zorque font */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_zorque, zorque.ttf, Zorque )
-+#endif
-+
-+/* Additional fonts for 2.0.3 */
-+
-+/* -URW-Gothic L */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_-URW-Gothic_L_Avantgarde, a010013l.ttf, -URW-Gothic L )
-+#endif
-+
-+/* -URW-Gothic L Bold */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_-URW-Gothic_L_Bold_Avantgarde, a010015l.ttf, -URW-Gothic L Bold )
-+#endif
-+
-+/* -URW-Gothic L Italic */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_-URW-Gothic_L_Italic_Avantgarde, a010033l.ttf, -URW-Gothic L Italic )
-+#endif
-+
-+/* -URW-Gothic L Bold Italic */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_-URW-Gothic_L_Bold_Italic_Avantgarde, a010035l.ttf, -URW-Gothic L Bold Italic )
-+#endif
-+
-+/* -URW-Bookman L */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_-URW-Bookman_L_Bookman, b018012l.ttf, -URW-Bookman L )
-+#endif
-+
-+/* -URW-Bookman L Bold */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_-URW-Bookman_L_Bold_Bookman, b018015l.ttf, -URW-Bookman L Bold )
-+#endif
-+
-+/* -URW-Bookman L Italic */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_-URW-Bookman_L_Italic_Bookman, b018032l.ttf, -URW-Bookman L Italic )
-+#endif
-+
-+/* -URW-Bookman L Bold Italic */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_-URW-Bookman_L_Bold_Italic_Bookman, b018035l.ttf, -URW-Bookman L Bold Italic )
-+#endif
-+
-+/* -URW-Century Schoolbook L */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_-URW-Century_Schoolbook_L_New_Century_SchoolBook, c059013l.ttf, -URW-Century Schoolbook L )
-+#endif
-+
-+/* -URW-Century Schoolbook L Bold */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_-URW-Century_Schoolbook_L_Bold_New_Century_SchoolBook, c059016l.ttf, -URW-Century Schoolbook L Bold )
-+#endif
-+
-+/* -URW-Century Schoolbook L Italic */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_-URW-Century_Schoolbook_L_Italic_New_Century_SchoolBook, c059033l.ttf, -URW-Century Schoolbook L Italic )
-+#endif
-+
-+/* -URW-Century Schoolbook L Bold Italic */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_-URW-Century_Schoolbook_L_Bold_Italic_New_Century_SchoolBook, c059036l.ttf, -URW-Century Schoolbook L Bold Italic )
-+#endif
-+
-+/* -URW-Nimbus Sans L */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Helvetica, n019003l.ttf, -URW-Nimbus Sans L )
-+#endif
-+
-+/* -URW-Nimbus Sans L Bold */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Bold_Helvetica, n019004l.ttf, -URW-Nimbus Sans L Bold )
-+#endif
-+
-+/* -URW-Nimbus Sans L Italic */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Italic_Helvetica, n019023l.ttf, -URW-Nimbus Sans L Italic )
-+#endif
-+
-+/* -URW-Nimbus Sans L Bold Italic */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Bold_Italic_Helvetica, n019024l.ttf, -URW-Nimbus Sans L Bold Italic )
-+#endif
-+
-+/* -URW-Nimbus Sans L Condensed */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Helvetica_Condensed, n019043l.ttf, -URW-Nimbus Sans L Condensed )
-+#endif
-+
-+/* -URW-Nimbus Sans L Bold Condensed */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Bold_Helvetica_Condensed, n019044l.ttf, -URW-Nimbus Sans L Bold Condensed )
-+#endif
-+
-+/* -URW-Nimbus Sans L Italic Condensed */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Italic_Helvetica_Condensed, n019063l.ttf, -URW-Nimbus Sans L Italic Condensed )
-+#endif
-+
-+/* -URW-Nimbus Sans L Bold Italic Condensed */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Bold_Italic_Helvetica_Condensed, n019064l.ttf, -URW-Nimbus Sans L Bold Italic Condensed )
-+#endif
-+
-+/* -URW-Nimbus Roman No9 L */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Roman_No9_L_Times, n021003l.ttf, -URW-Nimbus Roman No9 L )
-+#endif
-+
-+/* -URW-Nimbus Roman No9 L Bold */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Roman_No9_L_Bold_Times, n021004l.ttf, -URW-Nimbus Roman No9 L Bold )
-+#endif
-+
-+/* -URW-Nimbus Roman No9 L Italic */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Roman_No9_L_Italic_Times, n021023l.ttf, -URW-Nimbus Roman No9 L Italic )
-+#endif
-+
-+/* -URW-Nimbus Roman No9 L Bold Italic */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Roman_No9_L_Bold_Italic_Times, n021024l.ttf, -URW-Nimbus Roman No9 L Bold Italic )
-+#endif
-+
-+/* -URW-Nimbus Mono L */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Mono_L_Courier, n022003l.ttf, -URW-Nimbus Mono L )
-+#endif
-+
-+/* -URW-Nimbus Mono L Bold */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Mono_L_Bold_Courier, n022004l.ttf, -URW-Nimbus Mono L Bold )
-+#endif
-+
-+/* -URW-Nimbus Mono LK Italic */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Mono_LK_Italic_Courier, n022023l.ttf, -URW-Nimbus Mono LK Italic )
-+#endif
-+
-+/* -URW-Nimbus Mono L Bold Italic */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Mono_L_Bold_Italic_Courier, n022024l.ttf, -URW-Nimbus Mono L Bold Italic )
-+#endif
-+
-+/* -URW-Palladio L */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_-URW-Palladio_L_Palitino, p052003l.ttf, -URW-Palladio L )
-+#endif
-+
-+/* -URW-Palladio L Bold */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_-URW-Palladio_L_Bold_Palitino, p052004l.ttf, -URW-Palladio L Bold )
-+#endif
-+
-+/* -URW-Palladio L Italic */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_-URW-Palladio_L_Italic_Palitino, p052023l.ttf, -URW-Palladio L Italic )
-+#endif
-+
-+/* -URW-Palladio L Bold Italic */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_-URW-Palladio_L_Bold_Italic_Palitino, p052024l.ttf, -URW-Palladio L Bold Italic )
-+#endif
-+
-+/* -URW-Standard Symbols L */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_-URW-Standard_Symbols_L_Symbol, s050000l.ttf, -URW-Standard Symbols L )
-+#endif
-+
-+/* -URW-Chancery L */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_-URW-Chancery_L_Zapf_Chancery, z003034l.ttf, -URW-Chancery L )
-+#endif
-+
-+/* Dingbats */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_Dingbats, d050000l.ttf, Dingbats )
-+#endif
-+
-+/* Luxi Mono Bold */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_Luxi_Mono_Bold, luximb.ttf, Luxi Mono Bold )
-+#endif
-+
-+/* Luxi Mono Bold Oblique */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_Luxi_Mono_Bold_Oblique, luximbi.ttf, Luxi Mono Bold Oblique )
-+#endif
-+
-+/* Luxi Mono Regular */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_Luxi_Mono_Regular, luximr.ttf, Luxi Mono Regular )
-+#endif
-+
-+/* Luxi Mono Oblique */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_Luxi_Mono_Oblique, luximri.ttf, Luxi Mono Oblique )
-+#endif
-+
-+/* Luxi Serif Bold */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_Luxi_Serif_Bold, luxirb.ttf, Luxi Serif Bold )
-+#endif
-+
-+/* Luxi Serif Bold Oblique */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_Luxi_Serif_Bold_Oblique, luxirbi.ttf, Luxi Serif Bold Oblique )
-+#endif
-+
-+/* Luxi Serif Regular */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_Luxi_Serif_Regular, luxirr.ttf, Luxi Serif Regular )
-+#endif
-+
-+/* Luxi Serif Oblique */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_Luxi_Serif_Oblique, luxirri.ttf, Luxi Serif Oblique )
-+#endif
-+
-+/* Luxi Sans Bold */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_Luxi_Sans_Bold, luxisb.ttf, Luxi Sans Bold )
-+#endif
-+
-+/* Luxi Sans Bold Oblique */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_Luxi_Sans_Bold_Oblique, luxisbi.ttf, Luxi Sans Bold Oblique )
-+#endif
-+
-+/* Luxi Sans Regular */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_Luxi_Sans_Regular, luxisr.ttf, Luxi Sans Regular )
-+#endif
-+
-+/* Luxi Sans Oblique */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_Luxi_Sans_Oblique, luxisri.ttf, Luxi Sans Oblique )
-+#endif
-+
-+/* Gentium */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_Gentium, GenR102.TTF, Gentium )
-+#endif
-+
-+/* Gentium Italic */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_Gentium_Italic, GenI102.TTF, Gentium Italic )
-+#endif
-+
-+/* GentiumAlt */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_GentiumAlt, GenAR102.TTF, GentiumAlt )
-+#endif
-+
-+/* GentiumAlt Italic */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_GentiumAlt_Italic, GenAI102.TTF, GentiumAlt Italic )
-+#endif
-+
-+/* MgOpen Canonica Bold */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_MgOpen_Canonica_Bold, MgOpenCanonicaBold.ttf, MgOpen Canonica Bold )
-+#endif
-+
-+/* MgOpen Canonica Bold Italic */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_MgOpen_Canonica_Bold_Italic, MgOpenCanonicaBoldItalic.ttf, MgOpen Canonica Bold Italic)
-+#endif
-+
-+/* MgOpen Canonica Italic */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_MgOpen_Canonica_Italic, MgOpenCanonicaItalic.ttf, MgOpen Canonica Italic )
-+#endif
-+
-+/* MgOpen Canonica Regular */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_MgOpen_Canonica_Regular, MgOpenCanonicaRegular.ttf, MgOpen Canonica )
-+#endif
-+
-+/* Chopin Script */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_Chopin_Script, CHOPS___.TTF, Chopin Script )
-+#endif
-+
-+/* DTP Dingbats */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_DTPDingbats, DTPDingbats.ttf, DTP Dingbats )
-+#endif
-+
-+/* Justus Bold */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_Justus-Bold, Justus-Bold.ttf, Justus Bold )
-+#endif
-+
-+/* Justus Italic Oldstyle */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_Justus-ItalicOldstyle, Justus-ItalicOldstyle.ttf, Justus Italic Oldstyle )
-+#endif
-+
-+/* Justus Italic */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_Justus-Italic, Justus-Italic.ttf, Justus Italic )
-+#endif
-+
-+/* Justus Oldstyle */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_Justus-Oldstyle, Justus-Oldstyle.ttf, Justus Oldstyle )
-+#endif
-+
-+/* Justus Roman */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_Justus-Roman, Justus-Roman.ttf, Justus Roman )
-+#endif
-+
-+/* Justus Versalitas */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_Justus-Versalitas, Justus-Versalitas.ttf, Justus Versalitas )
-+#endif
-+
-+/* Let's trace basic */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_Lets_trace_basic, letstracebasic.ttf, Lets trace basic )
-+#endif
-+
-+/* Let's trace ruled */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_Lets_trace_ruled, letstraceruled.ttf, Lets trace ruled )
-+#endif
-+
-+/* Tuffy Bold Italic */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_Tuffy_Bold_Italic.ttf, Tuffy_Bold_Italic.ttf, Tuffy Bold Italic )
-+#endif
-+
-+/* Tuffy Bold */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_Tuffy_Bold, Tuffy_Bold.ttf, Tuffy Bold )
-+#endif
-+
-+/* Tuffy Italic */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_Tuffy_Italic, Tuffy_Italic.ttf, Tuffy Italic )
-+#endif
-+
-+/* Tuffy */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_Tuffy, Tuffy.ttf, Tuffy )
-+#endif
-+
-+/* Verina Sans Bold Oblique */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_Verina_Sans_Bold_Oblique, Verina_Sans_Bold_Oblique.otf, Verina Sans Bold Oblique )
-+#endif
-+
-+/* Verina Sans Bold */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_Verina_Sans_Bold, Verina_Sans_Bold.otf, Verina Sans Bold )
-+#endif
-+
-+/* Verina Sans Mono Bold Oblique */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_Verina_Sans_Mono_Bold_Oblique, Verina_Sans_Mono_Bold_Oblique.otf, Verina Sans Mono Bold Oblique )
-+#endif
-+
-+/* Verina Sans Mono Bold */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_Verina_Sans_Mono_Bold, Verina_Sans_Mono_Bold.otf, Verina Sans Mono Bold )
-+#endif
-+
-+/* Verina Sans Mono Oblique */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_Verina_Sans_Mono_Oblique, Verina_Sans_Mono_Oblique.otf, Verina Sans Mono Oblique )
-+#endif
-+
-+/* Verina Sans Mono */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_Verina_Sans_Mono, Verina_Sans_Mono.otf, Verina Sans Mono )
-+#endif
-+
-+/* Verina Sans Oblique */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_Verina_Sans_Oblique, Verina_Sans_Oblique.otf, Verina Sans Oblique )
-+#endif
-+
-+/* Verina Sans Roman */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_Verina_Sans_Roman, Verina_Sans_Roman.otf, Verina Sans Roman )
-+#endif
-+
-+/* Verina Serif Bold */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_Verina_Serif_Bold, Verina_Serif_Bold.otf, Verina Serif Bold )
-+#endif
-+
-+/* Verina Serif */
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_Verina_Serif, Verina_Serif.otf, Verina Serif )
-+#endif
-+
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONT_FILE( gid_File_Fnt_MagyarLinBiolinum, MagyarLinBiolinum.ttf, Magyar Linux Biolinum)
-+STD_FONT_FILE( gid_File_Fnt_MagyarLinBiolinumB, MagyarLinBiolinumB.ttf, Magyar Linux Biolinum Bold)
-+STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertine, MagyarLinLibertine.ttf, Magyar Linux Libertine)
-+STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineB, MagyarLinLibertineB.ttf, Magyar Linux Libertine Bold)
-+STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineBI, MagyarLinLibertineBI.ttf, Magyar Linux Libertine Bold Italic)
-+STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineC, MagyarLinLibertineC_Re.ttf, Magyar Linux Libertine Capital)
-+STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineG, MagyarLinLibertineG.ttf, Magyar Linux Libertine Graphite)
-+STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineGB, MagyarLinLibertineGB.ttf, Magyar Linux Libertine Bold Graphite)
-+STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineGBI, MagyarLinLibertineGBI.ttf, Magyar Linux Libertine Bold Italic Graphite)
-+STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineGI, MagyarLinLibertineGI.ttf, Magyar Linux Libertine Italic Graphite)
-+STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineI, MagyarLinLibertineI.ttf, Magyar Linux Libertine Italic)
-+STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineN, MagyarLinLibertineN.ttf, Magyar Linux N Libertine)
-+STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineNB, MagyarLinLibertineNB.ttf, Magyar Linux Libertine N Bold)
-+STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineNBI, MagyarLinLibertineNBI.ttf, Magyar Linux Libertine N Bold Italic)
-+STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineNI, MagyarLinLibertineNI.ttf, Magyar Linux Libertine N Italic)
-+STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineNC, MagyarLinLibertineNC_Re.ttf, Magyar Linux Libertine N Capital)
-+#endif
-+
-diff -Naur scp2.old/source/accessories/file_gallery_accessories.scp scp2/source/accessories/file_gallery_accessories.scp
---- scp2.old/source/accessories/file_gallery_accessories.scp 1970-01-01 01:00:00.000000000 +0100
-+++ scp2/source/accessories/file_gallery_accessories.scp 2008-12-15 10:19:15.000000000 +0100
-@@ -0,0 +1,146 @@
-+/*************************************************************************
-+*
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: file_gallery_accessories.scp,v $
-+ *
-+ * $Revision: 1.0 $
-+ *
-+ * last change: $Author: KAMI $ $Date: 2006/02/18 14:50:39 $
-+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, as published by the Free Software Foundation.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ *
-+************************************************************************/
-+
-+#include "macros.inc"
-+
-+/* *** KAMI Extras *** */
-+
-+/* ** Gallery ** */
-+
-+#ifndef WITHOUT_EXTRA_GALLERY
-+
-+File gid_File_Extra_Gallery_KAMI
-+ Dir = gid_Dir_Gallery;
-+ ARCHIVE_TXT_FILE_BODY;
-+ Name = "kamigallery.zip";
-+End
-+
-+File gid_File_Extra_Gallery_Draws_People_KAMI
-+ Dir = gid_Dir_Gallery_Draws_People;
-+ ARCHIVE_TXT_FILE_BODY;
-+ Name = "kamigallerydrawspeople.zip";
-+End
-+
-+File gid_File_Extra_Gallery_Photos_Plants_KAMI
-+ Dir = gid_Dir_Gallery_Photos_Plants;
-+ ARCHIVE_TXT_FILE_BODY;
-+ Name = "kamigalleryphotosplants.zip";
-+End
-+
-+File gid_File_Extra_Gallery_Photos_Celebration_KAMI
-+ Dir = gid_Dir_Gallery_Photos_Celebration;
-+ ARCHIVE_TXT_FILE_BODY;
-+ Name = "kamigalleryphotoscelebration.zip";
-+End
-+
-+File gid_File_Extra_Gallery_Photos_Fauna_KAMI
-+ Dir = gid_Dir_Gallery_Photos_Fauna;
-+ ARCHIVE_TXT_FILE_BODY;
-+ Name = "kamigalleryphotosfauna.zip";
-+End
-+
-+File gid_File_Extra_Gallery_Photos_Flowers_KAMI
-+ Dir = gid_Dir_Gallery_Photos_Flowers;
-+ ARCHIVE_TXT_FILE_BODY;
-+ Name = "kamigalleryphotosflowers.zip";
-+End
-+
-+File gid_File_Extra_Gallery_Photos_FoodsandDrinks_KAMI
-+ Dir = gid_Dir_Gallery_Photos_FoodsandDrinks;
-+ ARCHIVE_TXT_FILE_BODY;
-+ Name = "kamigalleryphotosfoodsanddrinks.zip";
-+End
-+
-+File gid_File_Extra_Gallery_Photos_Humans_KAMI
-+ Dir = gid_Dir_Gallery_Photos_Humans;
-+ ARCHIVE_TXT_FILE_BODY;
-+ Name = "kamigalleryphotoshumans.zip";
-+End
-+
-+File gid_File_Extra_Gallery_Photos_Landscapes_KAMI
-+ Dir = gid_Dir_Gallery_Photos_Landscapes;
-+ ARCHIVE_TXT_FILE_BODY;
-+ Name = "kamigalleryphotoslandscapes.zip";
-+End
-+
-+File gid_File_Extra_Gallery_Photos_Buildings_KAMI
-+ Dir = gid_Dir_Gallery_Photos_Buildings;
-+ ARCHIVE_TXT_FILE_BODY;
-+ Name = "kamigalleryphotosbuildings.zip";
-+End
-+
-+File gid_File_Extra_Gallery_Photos_Objects_KAMI
-+ Dir = gid_Dir_Gallery_Photos_Objects;
-+ ARCHIVE_TXT_FILE_BODY;
-+ Name = "kamigalleryphotosobjects.zip";
-+End
-+
-+File gid_File_Extra_Gallery_Photos_Cities_KAMI
-+ Dir = gid_Dir_Gallery_Photos_Cities;
-+ ARCHIVE_TXT_FILE_BODY;
-+ Name = "kamigalleryphotoscities.zip";
-+End
-+
-+File gid_File_Extra_Gallery_Photos_Space_KAMI
-+ Dir = gid_Dir_Gallery_Photos_Space;
-+ ARCHIVE_TXT_FILE_BODY;
-+ Name = "kamigalleryphotosspace.zip";
-+End
-+
-+File gid_File_Extra_Gallery_Photos_Statues_KAMI
-+ Dir = gid_Dir_Gallery_Photos_Statues;
-+ ARCHIVE_TXT_FILE_BODY;
-+ Name = "kamigalleryphotosstatues.zip";
-+End
-+
-+File gid_File_Extra_Gallery_Photos_Travel_KAMI
-+ Dir = gid_Dir_Gallery_Photos_Travel;
-+ ARCHIVE_TXT_FILE_BODY;
-+ Name = "kamigalleryphotostravel.zip";
-+End
-+
-+File gid_File_Extra_Gallery_Elements_Bullets2_KAMI
-+ Dir = gid_Dir_Gallery_Elements_Bullets2;
-+ ARCHIVE_TXT_FILE_BODY;
-+ Name = "kamigalleryelementsbullets2.zip";
-+End
-+
-+File gid_File_Extra_Gallery_NONFREE_KAMI
-+ Dir = gid_Dir_Gallery;
-+ ARCHIVE_TXT_FILE_BODY;
-+ Name = "kamigallerynonfree.zip";
-+End
-+
-+#endif
-diff -Naur scp2.old/source/accessories/file_samples_accessories.scp scp2/source/accessories/file_samples_accessories.scp
---- scp2.old/source/accessories/file_samples_accessories.scp 1970-01-01 01:00:00.000000000 +0100
-+++ scp2/source/accessories/file_samples_accessories.scp 2008-12-15 10:19:15.000000000 +0100
-@@ -0,0 +1,88 @@
-+/*************************************************************************
-+*
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: file_samples_accessories.scp,v $
-+ *
-+ * $Revision: 1.0 $
-+ *
-+ * last change: $Author: KAMI $ $Date: 2006/02/18 14:50:39 $
-+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, as published by the Free Software Foundation.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ *
-+************************************************************************/
-+
-+#include "macros.inc"
-+
-+/* *** KAMI Extras *** */
-+
-+/* ** Samples ** */
-+
-+#ifndef WITHOUT_EXTRA_SAMPLE
-+
-+File gid_File_Extra_Samples_KAMI
-+ Dir = gid_Dir_Samples_Language;
-+ TXT_FILE_BODY;
-+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ EXTRA_ALL_LANG(kamisamples,zip);
-+End
-+
-+File gid_File_Extra_Samples_Documentations_KAMI
-+ Dir = gid_Dir_Samples_Documentations;
-+ TXT_FILE_BODY;
-+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ EXTRA_ALL_LANG(kamisamplesdocumentation,zip);
-+End
-+
-+File gid_File_Extra_Samples_Advertisement_KAMI
-+ Dir = gid_Dir_Samples_Advertisement;
-+ TXT_FILE_BODY;
-+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ EXTRA_ALL_LANG(kamisamplesadvertisement,zip);
-+End
-+
-+/* ** Samples - NON FREE** */
-+
-+File gid_File_Extra_Samples_NONFREE_KAMI
-+ Dir = gid_Dir_Samples_Language;
-+ TXT_FILE_BODY;
-+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ EXTRA_ALL_LANG(kamisamplesnonfree,zip);
-+End
-+
-+File gid_File_Extra_Samples_NONFREE_Documentations_KAMI
-+ Dir = gid_Dir_Samples_Documentations;
-+ TXT_FILE_BODY;
-+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ EXTRA_ALL_LANG(kamisamplesnonfreedocumentation,zip);
-+End
-+
-+File gid_File_Extra_Samples_NONFREE_Advertisement_KAMI
-+ Dir = gid_Dir_Samples_Advertisement;
-+ TXT_FILE_BODY;
-+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ EXTRA_ALL_LANG(kamisamplesnonfreeadvertisement,zip);
-+End
-+
-+#endif
-diff -Naur scp2.old/source/accessories/file_templates_accessories.scp scp2/source/accessories/file_templates_accessories.scp
---- scp2.old/source/accessories/file_templates_accessories.scp 1970-01-01 01:00:00.000000000 +0100
-+++ scp2/source/accessories/file_templates_accessories.scp 2008-12-15 10:19:15.000000000 +0100
-@@ -0,0 +1,279 @@
-+/*************************************************************************
-+*
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: file_templates_accessories.scp,v $
-+ *
-+ * $Revision: 1.0 $
-+ *
-+ * last change: $Author: KAMI $ $Date: 2006/02/18 14:50:39 $
-+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, as published by the Free Software Foundation.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ *
-+************************************************************************/
-+
-+#include "macros.inc"
-+
-+/* *** KAMI Extras *** */
-+
-+/* ** Templates ** */
-+
-+#ifndef WITHOUT_EXTRA_TEMPLATE
-+
-+File gid_File_Extra_Templates_KAMI
-+ Dir = gid_Dir_Template_Language;
-+ TXT_FILE_BODY;
-+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ EXTRA_ALL_LANG(kamitemplates,zip);
-+End
-+
-+File gid_File_Extra_Templates_Layout_KAMI
-+ Dir = gid_Dir_Template_Layout;
-+ TXT_FILE_BODY;
-+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ EXTRA_ALL_LANG(kamitemplateslayout,zip);
-+End
-+
-+File gid_File_Extra_Templates_Present_KAMI
-+ Dir = gid_Dir_Template_Presnt;
-+ TXT_FILE_BODY;
-+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ EXTRA_ALL_LANG(kamitemplatespresent,zip);
-+End
-+
-+File gid_File_Extra_Templates_Educate_KAMI
-+ Dir = gid_Dir_Template_Educate;
-+ TXT_FILE_BODY;
-+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ EXTRA_ALL_LANG(kamitemplateseducate,zip);
-+End
-+
-+File gid_File_Extra_Templates_Finance_KAMI
-+ Dir = gid_Dir_Template_Finance;
-+ TXT_FILE_BODY;
-+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ EXTRA_ALL_LANG(kamitemplatesfinance,zip);
-+End
-+
-+File gid_File_Extra_Templates_Forms_KAMI
-+ Dir = gid_Dir_Template_Forms;
-+ TXT_FILE_BODY;
-+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ EXTRA_ALL_LANG(kamitemplatesforms,zip);
-+End
-+
-+File gid_File_Extra_Templates_Labels_KAMI
-+ Dir = gid_Dir_Template_Labels;
-+ TXT_FILE_BODY;
-+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ EXTRA_ALL_LANG(kamitemplateslabels,zip);
-+End
-+
-+File gid_File_Extra_Templates_Misc_KAMI
-+ Dir = gid_Dir_Template_Misc;
-+ TXT_FILE_BODY;
-+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ EXTRA_ALL_LANG(kamitemplatesmisc,zip);
-+End
-+
-+File gid_File_Extra_Templates_Officorr_KAMI
-+ Dir = gid_Dir_Template_Officorr;
-+ TXT_FILE_BODY;
-+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ EXTRA_ALL_LANG(kamitemplatesofficorr,zip);
-+End
-+
-+File gid_File_Extra_Templates_Offimisc_KAMI
-+ Dir = gid_Dir_Template_Offimisc;
-+ TXT_FILE_BODY;
-+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ EXTRA_ALL_LANG(kamitemplatesoffimisc,zip);
-+End
-+
-+File gid_File_Extra_Templates_Personal_KAMI
-+ Dir = gid_Dir_Template_Personal;
-+ TXT_FILE_BODY;
-+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ EXTRA_ALL_LANG(kamitemplatespersonal,zip);
-+End
-+
-+/* ** Templates - Common ** */
-+
-+File gid_File_Extra_Templates_Common
-+ Dir = gid_Dir_Template_Common;
-+ TXT_FILE_BODY;
-+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ Name = "kamitemplatescommon.zip";
-+End
-+
-+File gid_File_Extra_Templates_Common_Layout
-+ Dir = gid_Dir_Template_Common_Layout;
-+ TXT_FILE_BODY;
-+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ Name = "kamitemplatescommonlayout.zip";
-+End
-+
-+File gid_File_Extra_Templates_Common_Present
-+ Dir = gid_Dir_Template_Common_Presnt;
-+ TXT_FILE_BODY;
-+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ Name = "kamitemplatescommonpresent.zip";
-+End
-+
-+File gid_File_Extra_Templates_Common_Educate
-+ Dir = gid_Dir_Template_Common_Educate;
-+ TXT_FILE_BODY;
-+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ Name = "kamitemplatescommoneducate.zip";
-+End
-+
-+File gid_File_Extra_Templates_Common_Finance
-+ Dir = gid_Dir_Template_Common_Finance;
-+ TXT_FILE_BODY;
-+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ Name = "kamitemplatescommonfinance.zip";
-+End
-+
-+File gid_File_Extra_Templates_Common_Forms
-+ Dir = gid_Dir_Template_Common_Forms;
-+ TXT_FILE_BODY;
-+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ Name = "kamitemplatescommonforms.zip";
-+End
-+
-+File gid_File_Extra_Templates_Common_Labels
-+ Dir = gid_Dir_Template_Common_Labels;
-+ TXT_FILE_BODY;
-+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ Name = "kamitemplatescommonlabels.zip";
-+End
-+
-+File gid_File_Extra_Templates_Common_Misc
-+ Dir = gid_Dir_Template_Common_Misc;
-+ TXT_FILE_BODY;
-+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ Name = "kamitemplatescommonmisc.zip";
-+End
-+
-+File gid_File_Extra_Templates_Common_Officorr
-+ Dir = gid_Dir_Template_Common_Officorr;
-+ TXT_FILE_BODY;
-+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ Name = "kamitemplatescommonofficorr.zip";
-+End
-+
-+File gid_File_Extra_Templates_Common_Offimisc
-+ Dir = gid_Dir_Template_Common_Offimisc;
-+ TXT_FILE_BODY;
-+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ Name = "kamitemplatescommonoffimisc.zip";
-+End
-+
-+File gid_File_Extra_Templates_Common_Personal
-+ Dir = gid_Dir_Template_Common_Personal;
-+ TXT_FILE_BODY;
-+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ Name = "kamitemplatescommonpersonal.zip";
-+End
-+
-+/* ** Templates - NON FREE ** */
-+
-+File gid_File_Extra_Templates_NONFREE_KAMI
-+ Dir = gid_Dir_Template_Language;
-+ TXT_FILE_BODY;
-+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ EXTRA_ALL_LANG(kamitemplatesnonfree,zip);
-+End
-+
-+File gid_File_Extra_Templates_NONFREE_Layout_KAMI
-+ Dir = gid_Dir_Template_Layout;
-+ TXT_FILE_BODY;
-+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ EXTRA_ALL_LANG(kamitemplatesnonfreelayout,zip);
-+End
-+
-+File gid_File_Extra_Templates_NONFREE_Present_KAMI
-+ Dir = gid_Dir_Template_Presnt;
-+ TXT_FILE_BODY;
-+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ EXTRA_ALL_LANG(kamitemplatesnonfreepresent,zip);
-+End
-+
-+File gid_File_Extra_Templates_NONFREE_Educate_KAMI
-+ Dir = gid_Dir_Template_Educate;
-+ TXT_FILE_BODY;
-+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ EXTRA_ALL_LANG(kamitemplatesnonfreeeducate,zip);
-+End
-+
-+File gid_File_Extra_Templates_NONFREE_Finance_KAMI
-+ Dir = gid_Dir_Template_Finance;
-+ TXT_FILE_BODY;
-+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ EXTRA_ALL_LANG(kamitemplatesnonfreefinance,zip);
-+End
-+
-+File gid_File_Extra_Templates_NONFREE_Forms_KAMI
-+ Dir = gid_Dir_Template_Forms;
-+ TXT_FILE_BODY;
-+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ EXTRA_ALL_LANG(kamitemplatesnonfreeforms,zip);
-+End
-+
-+File gid_File_Extra_Templates_NONFREE_Labels_KAMI
-+ Dir = gid_Dir_Template_Labels;
-+ TXT_FILE_BODY;
-+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ EXTRA_ALL_LANG(kamitemplatesnonfreelabels,zip);
-+End
-+
-+File gid_File_Extra_Templates_NONFREE_Misc_KAMI
-+ Dir = gid_Dir_Template_Misc;
-+ TXT_FILE_BODY;
-+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ EXTRA_ALL_LANG(kamitemplatesnonfreemisc,zip);
-+End
-+
-+File gid_File_Extra_Templates_NONFREE_Officorr_KAMI
-+ Dir = gid_Dir_Template_Officorr;
-+ TXT_FILE_BODY;
-+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ EXTRA_ALL_LANG(kamitemplatesnonfreeofficorr,zip);
-+End
-+
-+File gid_File_Extra_Templates_NONFREE_Offimisc_KAMI
-+ Dir = gid_Dir_Template_Offimisc;
-+ TXT_FILE_BODY;
-+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ EXTRA_ALL_LANG(kamitemplatesnonfreeoffimisc,zip);
-+End
-+
-+File gid_File_Extra_Templates_NONFREE_Personal_KAMI
-+ Dir = gid_Dir_Template_Personal;
-+ TXT_FILE_BODY;
-+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ EXTRA_ALL_LANG(kamitemplatesnonfreepersonal,zip);
-+End
-+
-+#endif
-diff -Naur scp2.old/source/accessories/makefile.mk scp2/source/accessories/makefile.mk
---- scp2.old/source/accessories/makefile.mk 1970-01-01 01:00:00.000000000 +0100
-+++ scp2/source/accessories/makefile.mk 2008-12-15 10:19:15.000000000 +0100
-@@ -0,0 +1,70 @@
-+#*************************************************************************
-+#
-+# OpenOffice.org - a multi-platform office productivity suite
-+#
-+# $RCSfile: makefile.mk,v $
-+#
-+# $Revision: 1.0 $
-+#
-+# last change: $Author: KAMI $ $Date: 2006/02/18 14:50:39 $
-+#
-+# The Contents of this file are made available subject to
-+# the terms of GNU Lesser General Public License Version 2.1.
-+#
-+#
-+# GNU Lesser General Public License Version 2.1
-+# =============================================
-+# Copyright 2005 by Sun Microsystems, Inc.
-+# 901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+# This library is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU Lesser General Public
-+# License version 2.1, as published by the Free Software Foundation.
-+#
-+# This library is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+# Lesser General Public License for more details.
-+#
-+# You should have received a copy of the GNU Lesser General Public
-+# License along with this library; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+# MA 02111-1307 USA
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..
-+
-+PRJPCH=
-+
-+PRJNAME=scp2
-+TARGET=accessories
-+TARGETTYPE=CUI
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE : settings.mk
-+
-+SCP_PRODUCT_TYPE=osl
-+PARFILES= \
-+ module_accessories.par \
-+ module_gallery_accessories.par \
-+ module_templates_accessories.par \
-+ module_samples_accessories.par \
-+ module_font_accessories.par \
-+ file_accessories.par \
-+ file_gallery_accessories.par \
-+ file_templates_accessories.par \
-+ file_samples_accessories.par \
-+ file_font_accessories.par
-+
-+ULFFILES= \
-+ module_accessories.ulf \
-+ module_gallery_accessories.ulf \
-+ module_templates_accessories.ulf \
-+ module_samples_accessories.ulf \
-+ module_font_accessories.ulf
-+
-+
-+# --- File ---------------------------------------------------------
-+.INCLUDE : target.mk
-diff -Naur scp2.old/source/accessories/module_accessories.scp scp2/source/accessories/module_accessories.scp
---- scp2.old/source/accessories/module_accessories.scp 1970-01-01 01:00:00.000000000 +0100
-+++ scp2/source/accessories/module_accessories.scp 2008-12-17 17:35:58.000000000 +0100
-@@ -0,0 +1,51 @@
-+/*************************************************************************
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: module_accessories.scp,v $
-+ *
-+ * $Revision: 1.0 $
-+ *
-+ * last change: $Author: KAMI $ $Date: 2006/02/18 14:50:39 $
-+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, as published by the Free Software Foundation.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ *
-+ ************************************************************************/
-+
-+#include "macros.inc"
-+
-+Module gid_Module_Optional_Accessories
-+ ParentID = gid_Module_Optional;
-+ Files = (
-+#ifndef WITHOUT_EXTRA_ACCESSORY
-+ gid_File_Basic_Premium,
-+ gid_File_Basic_OOoWikipedia
-+#endif
-+ );
-+ Sortkey = "300";
-+ Minimal = NO;
-+ Default = YES;
-+ MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES);
-+End
-+
-diff -Naur scp2.old/source/accessories/module_accessories.ulf scp2/source/accessories/module_accessories.ulf
---- scp2.old/source/accessories/module_accessories.ulf 1970-01-01 01:00:00.000000000 +0100
-+++ scp2/source/accessories/module_accessories.ulf 2008-12-15 10:19:16.000000000 +0100
-@@ -0,0 +1,40 @@
-+/*************************************************************************
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: module_accessories.ulf,v $
-+ *
-+ * $Revision: 1.0 $
-+ *
-+ * last change: $Author: KAMI $ $Date: 2008/03/22 14:50:39 $
-+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, as published by the Free Software Foundation.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ *
-+ ************************************************************************/
-+
-+[STR_NAME_MODULE_OPTIONAL_ACCESSORIES]
-+en-US = "Accessories"
-+
-+[STR_DESC_MODULE_OPTIONAL_ACCESSORIES]
-+en-US = "Useful %PRODUCTNAME accessories including various Galleries, Templates, Sample documents and Fonts."
-diff -Naur scp2.old/source/accessories/module_font_accessories.scp scp2/source/accessories/module_font_accessories.scp
---- scp2.old/source/accessories/module_font_accessories.scp 1970-01-01 01:00:00.000000000 +0100
-+++ scp2/source/accessories/module_font_accessories.scp 2008-12-15 10:19:16.000000000 +0100
-@@ -0,0 +1,212 @@
-+/*************************************************************************
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: module_font_accessories.scp,v $
-+ *
-+ * $Revision: 1.0 $
-+ *
-+ * last change: $Author: KAMI $ $Date: 2008/03/22 14:50:39 $
-+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, as published by the Free Software Foundation.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ *
-+ ************************************************************************/
-+
-+#include "macros.inc"
-+
-+#ifndef WITHOUT_EXTRA_FONT
-+
-+Module gid_Module_Optional_Accessories_Fonts
-+ PackageInfo = "packinfo_accessories.txt";
-+ MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES_FONTS);
-+ ParentID = gid_Module_Optional_Accessories;
-+ Files = (
-+ gid_File_Fnt_airmole,
-+ gid_File_Fnt_airmolea,
-+ gid_File_Fnt_airmoles,
-+ gid_File_Fnt_airmoleq,
-+ gid_File_Fnt_astronbo,
-+ gid_File_Fnt_astronbi,
-+ gid_File_Fnt_astronbv,
-+ gid_File_Fnt_astronbw,
-+ gid_File_Fnt_baveuse,
-+ gid_File_Fnt_Berylium,
-+ gid_File_Fnt_Beryliub,
-+ gid_File_Fnt_Berylibi,
-+ gid_File_Fnt_Beryliui,
-+ gid_File_Fnt_BETSY2,
-+ gid_File_Fnt_bluehigh,
-+ gid_File_Fnt_bluebold,
-+ gid_File_Fnt_bluecond,
-+ gid_File_Fnt_bluehigl,
-+ gid_File_Fnt_bullpen_,
-+ gid_File_Fnt_bullpen3,
-+ gid_File_Fnt_bullpeni,
-+ gid_File_Fnt_colourba,
-+ gid_File_Fnt_colourbb,
-+ gid_File_Fnt_counters,
-+ gid_File_Fnt_creditva,
-+ gid_File_Fnt_creditvb,
-+ gid_File_Fnt_creditvz,
-+ gid_File_Fnt_creditvi,
-+ gid_File_Fnt_edmunds,
-+ gid_File_Fnt_edmundis,
-+ gid_File_Fnt_engeregu,
-+ gid_File_Fnt_engebold,
-+ gid_File_Fnt_engeboit,
-+ gid_File_Fnt_engeexpa,
-+ gid_File_Fnt_engeexbo,
-+ gid_File_Fnt_engeexbi,
-+ gid_File_Fnt_engeexit,
-+ gid_File_Fnt_engeital,
-+ gid_File_Fnt_goodfish,
-+ gid_File_Fnt_goodfisb,
-+ gid_File_Fnt_goodfisc,
-+ gid_File_Fnt_goodfisi,
-+ gid_File_Fnt_guanine_,
-+ gid_File_Fnt_gunplay,
-+ gid_File_Fnt_kirsty__,
-+ gid_File_Fnt_kirsty_b,
-+ gid_File_Fnt_kirstybi,
-+ gid_File_Fnt_kirsty_i,
-+ gid_File_Fnt_kirstyin,
-+ gid_File_Fnt_mufferaw,
-+ gid_File_Fnt_nasaliza,
-+ gid_File_Fnt_NEUROPOL,
-+ gid_File_Fnt_numberpi,
-+ gid_File_Fnt_pricedow,
-+ gid_File_Fnt_pupcat__,
-+ gid_File_Fnt_rina,
-+ gid_File_Fnt_sandoval,
-+ gid_File_Fnt_SAPPM___,
-+ gid_File_Fnt_screenge,
-+ gid_File_Fnt_steelfis,
-+ gid_File_Fnt_steelfib,
-+ gid_File_Fnt_steelout,
-+ gid_File_Fnt_strenuou,
-+ gid_File_Fnt_strenu3d,
-+ gid_File_Fnt_subpear_,
-+ gid_File_Fnt_teen____,
-+ gid_File_Fnt_teenbold,
-+ gid_File_Fnt_teenbdit,
-+ gid_File_Fnt_teenital,
-+ gid_File_Fnt_teenlite,
-+ gid_File_Fnt_teenlita,
-+ gid_File_Fnt_typoderm,
-+ gid_File_Fnt_vahika_,
-+ gid_File_Fnt_vahikab,
-+ gid_File_Fnt_vahikac,
-+ gid_File_Fnt_vahikai,
-+ gid_File_Fnt_vectroid,
-+ gid_File_Fnt_velvendc,
-+ gid_File_Fnt_velvenda,
-+ gid_File_Fnt_vibrocen,
-+ gid_File_Fnt_vibroceb,
-+ gid_File_Fnt_vibrocex,
-+ gid_File_Fnt_vibrocei,
-+ gid_File_Fnt_wintermu,
-+ gid_File_Fnt_youregon,
-+ gid_File_Fnt_youregoi,
-+ gid_File_Fnt_zekton__,
-+ gid_File_Fnt_zektonbo,
-+ gid_File_Fnt_zektonbi,
-+ gid_File_Fnt_zektonit,
-+ gid_File_Fnt_zorque,
-+ gid_File_Fnt_-URW-Gothic_L_Avantgarde,
-+ gid_File_Fnt_-URW-Gothic_L_Bold_Avantgarde,
-+ gid_File_Fnt_-URW-Gothic_L_Italic_Avantgarde,
-+ gid_File_Fnt_-URW-Gothic_L_Bold_Italic_Avantgarde,
-+ gid_File_Fnt_-URW-Bookman_L_Bookman,
-+ gid_File_Fnt_-URW-Bookman_L_Bold_Bookman,
-+ gid_File_Fnt_-URW-Bookman_L_Italic_Bookman,
-+ gid_File_Fnt_-URW-Bookman_L_Bold_Italic_Bookman,
-+ gid_File_Fnt_-URW-Century_Schoolbook_L_New_Century_SchoolBook,
-+ gid_File_Fnt_-URW-Century_Schoolbook_L_Bold_New_Century_SchoolBook,
-+ gid_File_Fnt_-URW-Century_Schoolbook_L_Italic_New_Century_SchoolBook,
-+ gid_File_Fnt_-URW-Century_Schoolbook_L_Bold_Italic_New_Century_SchoolBook,
-+ gid_File_Fnt_-URW-Nimbus_Sans_L_Helvetica,
-+ gid_File_Fnt_-URW-Nimbus_Sans_L_Bold_Helvetica,
-+ gid_File_Fnt_-URW-Nimbus_Sans_L_Italic_Helvetica,
-+ gid_File_Fnt_-URW-Nimbus_Sans_L_Bold_Italic_Helvetica,
-+ gid_File_Fnt_-URW-Nimbus_Sans_L_Helvetica_Condensed,
-+ gid_File_Fnt_-URW-Nimbus_Sans_L_Bold_Helvetica_Condensed,
-+ gid_File_Fnt_-URW-Nimbus_Sans_L_Italic_Helvetica_Condensed,
-+ gid_File_Fnt_-URW-Nimbus_Sans_L_Bold_Italic_Helvetica_Condensed,
-+ gid_File_Fnt_-URW-Nimbus_Roman_No9_L_Times,
-+ gid_File_Fnt_-URW-Nimbus_Roman_No9_L_Bold_Times,
-+ gid_File_Fnt_-URW-Nimbus_Roman_No9_L_Italic_Times,
-+ gid_File_Fnt_-URW-Nimbus_Roman_No9_L_Bold_Italic_Times,
-+ gid_File_Fnt_-URW-Nimbus_Mono_L_Courier,
-+ gid_File_Fnt_-URW-Nimbus_Mono_L_Bold_Courier,
-+ gid_File_Fnt_-URW-Nimbus_Mono_LK_Italic_Courier,
-+ gid_File_Fnt_-URW-Nimbus_Mono_L_Bold_Italic_Courier,
-+ gid_File_Fnt_-URW-Palladio_L_Palitino,
-+ gid_File_Fnt_-URW-Palladio_L_Bold_Palitino,
-+ gid_File_Fnt_-URW-Palladio_L_Italic_Palitino,
-+ gid_File_Fnt_-URW-Palladio_L_Bold_Italic_Palitino,
-+ gid_File_Fnt_-URW-Standard_Symbols_L_Symbol,
-+ gid_File_Fnt_-URW-Chancery_L_Zapf_Chancery,
-+ gid_File_Fnt_Dingbats,
-+ gid_File_Fnt_Luxi_Mono_Bold,
-+ gid_File_Fnt_Luxi_Mono_Bold_Oblique,
-+ gid_File_Fnt_Luxi_Mono_Regular,
-+ gid_File_Fnt_Luxi_Mono_Oblique,
-+ gid_File_Fnt_Luxi_Serif_Bold,
-+ gid_File_Fnt_Luxi_Serif_Bold_Oblique,
-+ gid_File_Fnt_Luxi_Serif_Regular,
-+ gid_File_Fnt_Luxi_Serif_Oblique,
-+ gid_File_Fnt_Luxi_Sans_Bold,
-+ gid_File_Fnt_Luxi_Sans_Bold_Oblique,
-+ gid_File_Fnt_Luxi_Sans_Regular,
-+ gid_File_Fnt_Luxi_Sans_Oblique,
-+ gid_File_Fnt_Gentium,
-+ gid_File_Fnt_Gentium_Italic,
-+ gid_File_Fnt_GentiumAlt,
-+ gid_File_Fnt_GentiumAlt_Italic,
-+ gid_File_Fnt_MgOpen_Canonica_Bold,
-+ gid_File_Fnt_MgOpen_Canonica_Bold_Italic,
-+ gid_File_Fnt_MgOpen_Canonica_Italic,
-+ gid_File_Fnt_MgOpen_Canonica_Regular,
-+ gid_File_Fnt_MagyarLinBiolinum,
-+ gid_File_Fnt_MagyarLinBiolinumB,
-+ gid_File_Fnt_MagyarLinLibertine,
-+ gid_File_Fnt_MagyarLinLibertineB,
-+ gid_File_Fnt_MagyarLinLibertineBI,
-+ gid_File_Fnt_MagyarLinLibertineC,
-+ gid_File_Fnt_MagyarLinLibertineG,
-+ gid_File_Fnt_MagyarLinLibertineGB,
-+ gid_File_Fnt_MagyarLinLibertineGBI,
-+ gid_File_Fnt_MagyarLinLibertineGI,
-+ gid_File_Fnt_MagyarLinLibertineI,
-+ gid_File_Fnt_MagyarLinLibertineN,
-+ gid_File_Fnt_MagyarLinLibertineNB,
-+ gid_File_Fnt_MagyarLinLibertineNBI,
-+ gid_File_Fnt_MagyarLinLibertineNI,
-+ gid_File_Fnt_MagyarLinLibertineNC );
-+ Minimal = NO;
-+ Default = YES;
-+ Styles = ( );
-+End
-+
-+#endif
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list