[ooo-build-commit] .: 3 commits - bin/setup.in bin/unpack configure.in download.in patches/dev300 po/ooo-build-hu.po po/ooo-build-hu.sdf po/ooo-build.pot po/ooo-build.sdf po/sdf-templates
Andras Timar
timar at kemper.freedesktop.org
Thu May 13 12:04:07 PDT 2010
bin/setup.in | 1
bin/unpack | 7 ++++
configure.in | 21 +++++++++++-
download.in | 7 ++++
patches/dev300/extensions_configure.diff | 21 +++++++++++-
patches/dev300/extensions_packinfo.diff | 18 ++++++++++
patches/dev300/magyarlinuxlibertine-fonts.diff | 18 ++--------
patches/dev300/scp2_extensions.diff | 42 +++++++++++++++++++++++--
po/ooo-build-hu.po | 12 +++++++
po/ooo-build-hu.sdf | 4 ++
po/ooo-build.pot | 11 ++++++
po/ooo-build.sdf | 2 +
po/sdf-templates/OxygenOffice.sdf | 2 +
13 files changed, 146 insertions(+), 20 deletions(-)
New commits:
commit f8257e576a5e149a970a57f5ab1a725d47a96b12
Author: Andras Timar <timar at fsf.hu>
Date: Thu May 13 06:35:39 2010 +0200
New version of Magyar Linux Libertine font
* configure.in:
diff --git a/configure.in b/configure.in
index 8bee414..5aaa9d1 100644
--- a/configure.in
+++ b/configure.in
@@ -891,7 +891,7 @@ AC_SUBST(BUILD_MOZILLA_SOURCE)
AGFA_MONOTYPE_FONTS_SOURCE='agfa-monotype-fonts.tar.gz'
AC_SUBST(AGFA_MONOTYPE_FONTS_SOURCE)
-MAGYARLINUXLIBERTINE_FONTS_TIMESTAMP=20100512
+MAGYARLINUXLIBERTINE_FONTS_TIMESTAMP=20100513
AC_SUBST(MAGYARLINUXLIBERTINE_FONTS_TIMESTAMP)
OOO_BUILD_NOARCH="NO"
commit 4da73733309d3bc59ad540a3cb1ee60b80eeb649
Author: Andras Timar <timar at fsf.hu>
Date: Thu May 13 06:34:16 2010 +0200
Added Typography toolbar extension
* bin/setup.in:
* bin/unpack:
* configure.in:
* download.in:
* patches/dev300/extensions_configure.diff:
* patches/dev300/extensions_packinfo.diff:
* patches/dev300/scp2_extensions.diff:
* po/ooo-build-hu.po:
* po/ooo-build-hu.sdf:
* po/ooo-build.pot:
* po/ooo-build.sdf:
* po/sdf-templates/OxygenOffice.sdf:
diff --git a/bin/setup.in b/bin/setup.in
index f8d65fe..12e59a1 100755
--- a/bin/setup.in
+++ b/bin/setup.in
@@ -37,6 +37,7 @@ LIGHTPROOF_LANG='@LIGHTPROOF_LANG@'
LIGHTPROOF_FILENAMES='@LIGHTPROOF_FILENAMES@'
NUMBERTEXT_EXTENSION='@NUMBERTEXT_EXTENSION@'
HUNART_EXTENSION='@HUNART_EXTENSION@'
+TYPO_EXTENSION='@TYPO_EXTENSION@'
CT2N_EXTENSION='@CT2N_EXTENSION@'
WATCH_WINDOW_EXTENSION='@WATCH_WINDOW_EXTENSION@'
GOOGLE_DOCS_EXTENSION='@GOOGLE_DOCS_EXTENSION@'
diff --git a/bin/unpack b/bin/unpack
index 39f4e3f..c179506 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -909,6 +909,13 @@ if test "x$HUNART_EXTENSION" != "x"; then
$GNUCP $SRCDIR/$HUNART_EXTENSION -d $OOBUILDDIR/extras/source/extensions/hunart.oxt || exit 1
fi
+if test "x$TYPO_EXTENSION" != "x"; then
+ check_file $SRCDIR/$TYPO_EXTENSION
+ echo "Copying Typography Toolbar extension into the tree"
+ mkdir -p $OOBUILDDIR/extras/source/extensions/ || exit 1
+ $GNUCP $SRCDIR/$TYPO_EXTENSION -d $OOBUILDDIR/extras/source/extensions/typo.oxt || exit 1
+fi
+
if test "x$CT2N_EXTENSION" != "x"; then
check_file $SRCDIR/$CT2N_EXTENSION
echo "Copying ConvertTextToNumber extension into the tree"
diff --git a/configure.in b/configure.in
index f9d62f1..8bee414 100644
--- a/configure.in
+++ b/configure.in
@@ -413,6 +413,11 @@ AC_ARG_WITH(hunart,
--with-hunart Download and integrate the Hungarian cross-reference toolbar extension.],
,)
+AC_ARG_WITH(typo,
+[
+ --with-typo Download and integrate the Typography toolbar extension.],
+,)
+
AC_ARG_WITH(gnu-cp,
[
--with-gnu-cp The parameter is an absolute path to GNU cp.
@@ -1511,6 +1516,20 @@ fi
AC_SUBST(WITH_HUNART)
AC_SUBST(HUNART_EXTENSION)
+AC_MSG_CHECKING([whether to include typo extension])
+if test "$enable_extensions" != "no" ; then
+ if test "z$with_typo" = "zyes" ; then
+ TYPO_EXTENSION="typo-0.2.oxt"
+ WITH_TYPO=YES
+ AC_MSG_RESULT([yes])
+ else
+ WITH_TYPO=NO
+ AC_MSG_RESULT([no])
+ fi
+fi
+AC_SUBST(WITH_TYPO)
+AC_SUBST(TYPO_EXTENSION)
+
AC_MSG_CHECKING([whether to enable debugging code])
if test "$enable_dbgutil" = "yes" ; then
build_product=debug
diff --git a/download.in b/download.in
index 6ee9095..4d0416f 100755
--- a/download.in
+++ b/download.in
@@ -152,6 +152,9 @@ sub trim($)
# Hungarian Cross-reference toolbar extension
'hunart-*' => 'http://ftp.fsf.hu/OpenOffice.org_hu/hunart/',
+# Typography toolbar extension
+ 'typo-*' => 'http://ftp.fsf.hu/OpenOffice.org_hu/typo/',
+
# ConvertTextToNumber extension
'ConvertTextToNumber-*' => 'http://download.go-oo.org/src/',
@@ -505,6 +508,10 @@ if ('@HUNART_EXTENSION@' ne '') {
source_file( '@HUNART_EXTENSION@' );
}
+if ('@TYPO_EXTENSION@' ne '') {
+ source_file( '@TYPO_EXTENSION@' );
+}
+
if ('@CT2N_EXTENSION@' ne '') {
source_file( '@CT2N_EXTENSION@' );
}
diff --git a/patches/dev300/extensions_configure.diff b/patches/dev300/extensions_configure.diff
index 997d579..30e03d4 100644
--- a/patches/dev300/extensions_configure.diff
+++ b/patches/dev300/extensions_configure.diff
@@ -14,7 +14,7 @@
AC_ARG_WITH(fonts,
[ --without-fonts OOo includes some third-party fonts to provide a reliable
basis for help content, templates, samples, etc.
-@@ -797,6 +804,46 @@ AC_ARG_WITH(alloc,
+@@ -797,6 +804,51 @@ AC_ARG_WITH(alloc,
[ --with-alloc Define which allocator to build with
(choices are oo, system, tcmalloc)
],,)
@@ -38,6 +38,11 @@
+ --with-hunart Integrate Hungarian Cross-reference Toolbar extension],
+,)
+
++AC_ARG_WITH(typo,
++[
++ --with-typo Integrate Typography Toolbar extension],
++,)
++
+AC_ARG_WITH(watch-window,
+[
+ --with-watch-window Integrate Watch Window extension to Calc],
@@ -101,7 +106,7 @@
SYSTEM_JFREEREPORT=NO
fi
AC_SUBST(ENABLE_REPORTBUILDER)
-@@ -6609,6 +6644,178 @@ else
+@@ -6609,6 +6644,190 @@ else
fi
dnl ===================================================================
@@ -199,6 +204,18 @@
+AC_SUBST(WITH_HUNART_EXTENSION)
+
+dnl ===================================================================
++dnl Test whether to include Typography Toolbar extension
++dnl ===================================================================
++AC_MSG_CHECKING([for Typography Toolbar extension integration])
++if test "z$with_typo" = "z" -o "z$with_typo" = "zno" ; then
++ AC_MSG_RESULT([no])
++ SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_TYPO"
++else
++ AC_MSG_RESULT([yes])
++fi
++AC_SUBST(WITH_TYPO_EXTENSION)
++
++dnl ===================================================================
+dnl Test whether to include Google Docs extension
+dnl ===================================================================
+AC_MSG_CHECKING([for Google Docs extension integration])
diff --git a/patches/dev300/extensions_packinfo.diff b/patches/dev300/extensions_packinfo.diff
index 2123250..aded395 100644
--- a/patches/dev300/extensions_packinfo.diff
+++ b/patches/dev300/extensions_packinfo.diff
@@ -1,6 +1,6 @@
--- setup_native/source/packinfo/packinfo_extensions.txt 2008-06-06 22:36:48.000000000 +0200
+++ setup_native/source/packinfo/packinfo_extensions.txt 2010-03-08 20:27:56.000000000 +0100
-@@ -0,0 +1,241 @@
+@@ -0,0 +1,257 @@
+# Format:
+
+# Start
@@ -148,6 +148,22 @@
+End
+
+Start
++module = "gid_Module_Optional_Extensions_Typo"
++script = "shellscripts_extensions.txt"
++solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-typo"
++solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
++packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-typo"
++requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
++linuxpatchrequires = ""
++copyright = "2010 by FSF.hu"
++solariscopyright = "solariscopyrightfile"
++vendor = "OpenOffice.org"
++description = "Typography Toolbar extension for %PRODUCTNAME %PRODUCTVERSION"
++destpath = "/opt"
++packageversion = "%PACKAGEVERSION"
++End
++
++Start
+module = "gid_Module_Optional_Extensions_CT2N"
+script = "shellscripts_extensions.txt"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-ct2n"
diff --git a/patches/dev300/scp2_extensions.diff b/patches/dev300/scp2_extensions.diff
index 05e734e..b4c45c0 100644
--- a/patches/dev300/scp2_extensions.diff
+++ b/patches/dev300/scp2_extensions.diff
@@ -1,6 +1,6 @@
--- scp2/source/extensions/file_extensions.scp.old 2009-10-27 15:31:48.000000000 +0100
+++ scp2/source/extensions/file_extensions.scp 2009-10-27 15:36:41.000000000 +0100
-@@ -0,0 +1,214 @@
+@@ -0,0 +1,227 @@
+/*************************************************************************
+*
+ * OpenOffice.org - a multi-platform office productivity suite
@@ -145,6 +145,19 @@
+
+#endif
+
++/* ** Typography Toolbar** */
++
++#ifndef WITHOUT_EXTENSION_TYPO
++
++File gid_File_Oxt_Typo
++ TXT_FILE_BODY;
++ Styles = (PACKED);
++ Dir = gid_Brand_Dir_Share_Extension_Install;
++ Name = "typo.oxt";
++End
++
++#endif
++
+/* ** Watch Window ** */
+
+#ifdef WITH_EXTENSION_WATCH_WINDOW
@@ -282,7 +295,7 @@
+
--- scp2/source/extensions/module_extensions.scp.old 2009-10-27 15:31:48.000000000 +0100
+++ scp2/source/extensions/module_extensions.scp 2009-10-27 15:40:55.000000000 +0100
-@@ -0,0 +1,265 @@
+@@ -0,0 +1,282 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
@@ -462,6 +475,23 @@
+#endif
+#endif
+
++/* ** Typography Toolbar ** */
++
++#ifndef WITHOUT_EXTENSION_TYPO
++#ifdef WITH_EXTENSION_INTEGRATION
++Module gid_Module_Optional_Extensions_Typo
++ PackageInfo = "packinfo_extensions.txt";
++ MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_TYPO);
++ ParentID = gid_Module_Optional_Extensions;
++ Files = (
++ gid_File_Oxt_Typo );
++ Minimal = NO;
++ Default = YES;
++ Styles = ( );
++End
++#endif
++#endif
++
+/* ** Watch Window ** */
+
+#ifdef WITH_EXTENSION_WATCH_WINDOW
@@ -667,7 +697,7 @@
+#endif
--- scp2/source/extensions/module_extensions.ulf.old 2009-10-27 15:31:48.000000000 +0100
+++ scp2/source/extensions/module_extensions.ulf 2009-10-27 15:50:25.000000000 +0100
-@@ -0,0 +1,121 @@
+@@ -0,0 +1,127 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
@@ -757,6 +787,12 @@
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_HUNART]
+en-US = "Toolbar to add cross-references with automatic conditional Hungarian articles (eg. *az* 5. ábra, *a* 6. ábra) to avoid bad article and number combination in cross-references."
+
++[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_TYPO]
++en-US = "Typography toolbar"
++
++[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_TYPO]
++en-US = "Toolbar for Graphite smart font features: ligatures, small caps, old style numbers, proportional or monospaced numbers, automatic thousand separators, minus sign, real superscript and subscript, German umlaut variants, fractions."
++
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_WATCH_WINDOW]
+en-US = "Watch Window"
+
diff --git a/po/ooo-build-hu.po b/po/ooo-build-hu.po
index 306aada..50be959 100644
--- a/po/ooo-build-hu.po
+++ b/po/ooo-build-hu.po
@@ -469,6 +469,14 @@ msgstr ""
"az 5. ábra elé még beszúrunk egy sorszámozott ábrát, megnövelve ezzel az 5. "
"ábra sorszámát)."
+#: scp2/source/extensions/module_extensions.ulf#STR_DESC_MODULE_OPTIONAL_EXTENSIONS_TYPO.LngText.text
+msgid ""
+"Toolbar for Graphite smart font features: ligatures, small caps, old style numbers, "
+"proportional or monospaced numbers, automatic thousand separators, minus sign, real "
+"superscript and subscript, German umlaut variants, fractions."
+msgstr "Tipográfiai eszköztár ligatúrák, kiskapitális, ugráló számok, alsó és felső "
+"indexek, törtszámok és egyebek formázásához a megfelelő betűkészlettel."
+
#: scp2/source/extensions/module_extensions.ulf#STR_DESC_MODULE_OPTIONAL_EXTENSIONS_OOOBLOGGER.LngText.text
msgctxt ""
"scp2/source/extensions/module_extensions."
@@ -550,6 +558,10 @@ msgstr "Numbertext"
msgid "Hungarian cross-reference toolbar"
msgstr "Magyar névelős kereszthivatkozások eszköztár"
+#: scp2/source/extensions/module_extensions.ulf#STR_NAME_MODULE_OPTIONAL_EXTENSIONS_TYPO.LngText.text
+msgid "Typography toolbar"
+msgstr "Tipográfia eszköztár"
+
#: scp2/source/extensions/module_extensions.ulf#STR_NAME_MODULE_OPTIONAL_EXTENSIONS_OOOBLOGGER.LngText.text
msgctxt ""
"scp2/source/extensions/module_extensions."
diff --git a/po/ooo-build-hu.sdf b/po/ooo-build-hu.sdf
index 13f33eb..3743616 100644
--- a/po/ooo-build-hu.sdf
+++ b/po/ooo-build-hu.sdf
@@ -142,6 +142,8 @@ scp2 source\extensions\module_extensions.ulf 0 LngText STR_DESC_MODULE_OPTIONAL_
scp2 source\extensions\module_extensions.ulf 0 LngText STR_DESC_MODULE_OPTIONAL_EXTENSIONS_NLPSOLVER 999 hu Megoldó nemlineáris programozási feladatokhoz 2002-02-02 02:02:02
scp2 source\extensions\module_extensions.ulf 0 LngText STR_DESC_MODULE_OPTIONAL_EXTENSIONS_NUMBERTEXT 999 en-US The NUMBERTEXT/MONEYTEXT functions are number name and currency conversion spreadsheet functions. 2002-02-02 02:02:02
scp2 source\extensions\module_extensions.ulf 0 LngText STR_DESC_MODULE_OPTIONAL_EXTENSIONS_NUMBERTEXT 999 hu A NUMBERTEXT/MONEYTEXT munkalapfüggvények számok és pénzösszegek szöveggel való kiÃrását végzik el. 2002-02-02 02:02:02
+scp2 source\extensions\module_extensions.ulf 0 LngText STR_DESC_MODULE_OPTIONAL_EXTENSIONS_TYPO 0 en-US Toolbar for Graphite smart font features: ligatures, small caps, old style numbers, proportional or monospaced numbers, automatic thousand separators, minus sign, real superscript and subscript, German umlaut variants, fractions. 20090819 18:33:07
+scp2 source\extensions\module_extensions.ulf 0 LngText STR_DESC_MODULE_OPTIONAL_EXTENSIONS_TYPO 0 hu Tipográfiai eszköztár ligatúrák, kiskapitális, ugráló számok, alsó és felső indexek, törtszámok és egyebek formázásához a megfelelő betűkészlettel. 20090819 18:33:07
scp2 source\extensions\module_extensions.ulf 0 LngText STR_DESC_MODULE_OPTIONAL_EXTENSIONS_OOOBLOGGER 999 en-US Metaweblog Support 2002-02-02 02:02:02
scp2 source\extensions\module_extensions.ulf 0 LngText STR_DESC_MODULE_OPTIONAL_EXTENSIONS_OOOBLOGGER 999 hu Metaweblog támogatása 2002-02-02 02:02:02
scp2 source\extensions\module_extensions.ulf 0 LngText STR_DESC_MODULE_OPTIONAL_EXTENSIONS_PDFIMPORT 999 en-US The PDF Import Extension allows you to import and modify PDF documents. 2002-02-02 02:02:02
@@ -170,6 +172,8 @@ scp2 source\extensions\module_extensions.ulf 0 LngText STR_NAME_MODULE_OPTIONAL_
scp2 source\extensions\module_extensions.ulf 0 LngText STR_NAME_MODULE_OPTIONAL_EXTENSIONS_NLPSOLVER 999 hu NLP Solver 2002-02-02 02:02:02
scp2 source\extensions\module_extensions.ulf 0 LngText STR_NAME_MODULE_OPTIONAL_EXTENSIONS_NUMBERTEXT 999 en-US Numbertext 2002-02-02 02:02:02
scp2 source\extensions\module_extensions.ulf 0 LngText STR_NAME_MODULE_OPTIONAL_EXTENSIONS_NUMBERTEXT 999 hu Numbertext 2002-02-02 02:02:02
+scp2 source\extensions\module_extensions.ulf 0 LngText STR_NAME_MODULE_OPTIONAL_EXTENSIONS_TYPO 0 en-US Typography toolbar 20090819 18:33:07
+scp2 source\extensions\module_extensions.ulf 0 LngText STR_NAME_MODULE_OPTIONAL_EXTENSIONS_TYPO 0 hu Tipográfia eszköztár 20090819 18:33:07
scp2 source\extensions\module_extensions.ulf 0 LngText STR_NAME_MODULE_OPTIONAL_EXTENSIONS_OOOBLOGGER 999 en-US Metaweblog Support 2002-02-02 02:02:02
scp2 source\extensions\module_extensions.ulf 0 LngText STR_NAME_MODULE_OPTIONAL_EXTENSIONS_OOOBLOGGER 999 hu Metaweblog támogatása 2002-02-02 02:02:02
scp2 source\extensions\module_extensions.ulf 0 LngText STR_NAME_MODULE_OPTIONAL_EXTENSIONS_PDFIMPORT 999 en-US Sun PDF Import 2002-02-02 02:02:02
diff --git a/po/ooo-build.pot b/po/ooo-build.pot
index b3c25bc..0b4e64f 100644
--- a/po/ooo-build.pot
+++ b/po/ooo-build.pot
@@ -378,6 +378,13 @@ msgid ""
"cross-references."
msgstr ""
+#: scp2/source/extensions/module_extensions.ulf#STR_DESC_MODULE_OPTIONAL_EXTENSIONS_TYPO.LngText.text
+msgid ""
+"Toolbar for Graphite smart font features: ligatures, small caps, old style numbers, "
+"proportional or monospaced numbers, automatic thousand separators, minus sign, real "
+"superscript and subscript, German umlaut variants, fractions."
+msgstr ""
+
#: scp2/source/extensions/module_extensions.ulf#STR_DESC_MODULE_OPTIONAL_EXTENSIONS_OOOBLOGGER.LngText.text
msgctxt "scp2/source/extensions/module_extensions.ulf#STR_DESC_MODULE_OPTIONAL_EXTENSIONS_OOOBLOGGER.LngText.text"
msgid "Metaweblog Support"
@@ -444,6 +451,10 @@ msgstr ""
msgid "Hungarian cross-reference toolbar"
msgstr ""
+#: scp2/source/extensions/module_extensions.ulf#STR_NAME_MODULE_OPTIONAL_EXTENSIONS_TYPO.LngText.text
+msgid "Typography toolbar"
+msgstr ""
+
#: scp2/source/extensions/module_extensions.ulf#STR_NAME_MODULE_OPTIONAL_EXTENSIONS_OOOBLOGGER.LngText.text
msgctxt "scp2/source/extensions/module_extensions.ulf#STR_NAME_MODULE_OPTIONAL_EXTENSIONS_OOOBLOGGER.LngText.text"
msgid "Metaweblog Support"
diff --git a/po/ooo-build.sdf b/po/ooo-build.sdf
index 829115e..1252a2a 100644
--- a/po/ooo-build.sdf
+++ b/po/ooo-build.sdf
@@ -70,6 +70,7 @@ scp2 source\extensions\module_extensions.ulf 0 LngText STR_DESC_MODULE_OPTIONAL_
scp2 source\extensions\module_extensions.ulf 0 LngText STR_DESC_MODULE_OPTIONAL_EXTENSIONS_NLPSOLVER 999 en-US Solver for Nonlinear Programming 2002-02-02 02:02:02
scp2 source\extensions\module_extensions.ulf 0 LngText STR_DESC_MODULE_OPTIONAL_EXTENSIONS_NUMBERTEXT 999 en-US The NUMBERTEXT/MONEYTEXT functions are number name and currency conversion spreadsheet functions. 2002-02-02 02:02:02
scp2 source\extensions\module_extensions.ulf 0 LngText STR_DESC_MODULE_OPTIONAL_EXTENSIONS_HUNART 0 en-US Toolbar to add cross-references with automatic conditional Hungarian articles (eg. *az* 5. ábra, *a* 6. ábra) to avoid bad article and number combination in cross-references. 20090819 18:33:07
+scp2 source\extensions\module_extensions.ulf 0 LngText STR_DESC_MODULE_OPTIONAL_EXTENSIONS_TYPO 0 en-US Toolbar for Graphite smart font features: ligatures, small caps, old style numbers, proportional or monospaced numbers, automatic thousand separators, minus sign, real superscript and subscript, German umlaut variants, fractions. 20090819 18:33:07
scp2 source\extensions\module_extensions.ulf 0 LngText STR_DESC_MODULE_OPTIONAL_EXTENSIONS_OOOBLOGGER 999 en-US Metaweblog Support 2002-02-02 02:02:02
scp2 source\extensions\module_extensions.ulf 0 LngText STR_DESC_MODULE_OPTIONAL_EXTENSIONS_PDFIMPORT 999 en-US The PDF Import Extension allows you to import and modify PDF documents. 2002-02-02 02:02:02
scp2 source\extensions\module_extensions.ulf 0 LngText STR_DESC_MODULE_OPTIONAL_EXTENSIONS_PRESENTER_SCREEN 999 en-US The Presenter Console Extension provides more control over your slide show presentation, such as the ability to see the upcoming slide, the slide notes, and a presentation timer whereas the audience see only the current slide. 2002-02-02 02:02:02
@@ -84,6 +85,7 @@ scp2 source\extensions\module_extensions.ulf 0 LngText STR_NAME_MODULE_OPTIONAL_
scp2 source\extensions\module_extensions.ulf 0 LngText STR_NAME_MODULE_OPTIONAL_EXTENSIONS_NLPSOLVER 999 en-US NLP Solver 2002-02-02 02:02:02
scp2 source\extensions\module_extensions.ulf 0 LngText STR_NAME_MODULE_OPTIONAL_EXTENSIONS_NUMBERTEXT 999 en-US Numbertext 2002-02-02 02:02:02
scp2 source\extensions\module_extensions.ulf 0 LngText STR_NAME_MODULE_OPTIONAL_EXTENSIONS_HUNART 0 en-US Hungarian cross-reference toolbar 20090819 18:33:07
+scp2 source\extensions\module_extensions.ulf 0 LngText STR_NAME_MODULE_OPTIONAL_EXTENSIONS_TYPO 0 en-US Typography toolbar 20090819 18:33:07
scp2 source\extensions\module_extensions.ulf 0 LngText STR_NAME_MODULE_OPTIONAL_EXTENSIONS_OOOBLOGGER 999 en-US Metaweblog Support 2002-02-02 02:02:02
scp2 source\extensions\module_extensions.ulf 0 LngText STR_NAME_MODULE_OPTIONAL_EXTENSIONS_PDFIMPORT 999 en-US Sun PDF Import 2002-02-02 02:02:02
scp2 source\extensions\module_extensions.ulf 0 LngText STR_NAME_MODULE_OPTIONAL_EXTENSIONS_PRESENTER_SCREEN 999 en-US Sun Presenter Console 2002-02-02 02:02:02
diff --git a/po/sdf-templates/OxygenOffice.sdf b/po/sdf-templates/OxygenOffice.sdf
index 6927332..0cb5c83 100644
--- a/po/sdf-templates/OxygenOffice.sdf
+++ b/po/sdf-templates/OxygenOffice.sdf
@@ -36,6 +36,8 @@ scp2 source\extensions\module_extensions.ulf 0 LngText STR_NAME_MODULE_OPTIONAL_
scp2 source\extensions\module_extensions.ulf 0 LngText STR_DESC_MODULE_OPTIONAL_EXTENSIONS_NUMBERTEXT 0 en-US The NUMBERTEXT/MONEYTEXT functions are number name and currency conversion spreadsheet functions. 20090819 18:33:07
scp2 source\extensions\module_extensions.ulf 0 LngText STR_NAME_MODULE_OPTIONAL_EXTENSIONS_HUNART 0 en-US Hungarian cross-reference toolbar 20090819 18:33:07
scp2 source\extensions\module_extensions.ulf 0 LngText STR_DESC_MODULE_OPTIONAL_EXTENSIONS_HUNART 0 en-US Toolbar to add cross-references with automatic conditional Hungarian articles (eg. *az* 5. ábra, *a* 6. ábra) to avoid bad article and number combination in cross-references. 20090819 18:33:07
+scp2 source\extensions\module_extensions.ulf 0 LngText STR_NAME_MODULE_OPTIONAL_EXTENSIONS_TYPO 0 en-US Typography toolbar 20090819 18:33:07
+scp2 source\extensions\module_extensions.ulf 0 LngText STR_DESC_MODULE_OPTIONAL_EXTENSIONS_TYPO 0 en-US Toolbar for Graphite smart font features: ligatures, small caps, old style numbers, proportional or monospaced numbers, automatic thousand separators, minus sign, real superscript and subscript, German umlaut variants, fractions. 20090819 18:33:07
scp2 source\extensions\module_extensions.ulf 0 LngText STR_NAME_MODULE_OPTIONAL_EXTENSIONS_WATCH_WINDOW 0 en-US Watch Window 20090819 18:33:07
scp2 source\extensions\module_extensions.ulf 0 LngText STR_DESC_MODULE_OPTIONAL_EXTENSIONS_WATCH_WINDOW 0 en-US The Watch Window is a separate, small window that remains "on top" and enables users to monitor a selected set of cells. 20090819 18:33:07
scp2 source\extensions\module_extensions.ulf 0 LngText STR_NAME_MODULE_OPTIONAL_EXTENSIONS_OOOBLOGGER 0 en-US Metaweblog Support 20090819 18:33:07
commit f0ba336f2265b283cf1952098206e240db50b891
Author: Andras Timar <timar at fsf.hu>
Date: Wed May 12 20:48:30 2010 +0200
New version of Magyar Linux Libertine font package
* configure.in:
* patches/dev300/magyarlinuxlibertine-fonts.diff:
diff --git a/configure.in b/configure.in
index 8b4b8a2..f9d62f1 100644
--- a/configure.in
+++ b/configure.in
@@ -886,7 +886,7 @@ AC_SUBST(BUILD_MOZILLA_SOURCE)
AGFA_MONOTYPE_FONTS_SOURCE='agfa-monotype-fonts.tar.gz'
AC_SUBST(AGFA_MONOTYPE_FONTS_SOURCE)
-MAGYARLINUXLIBERTINE_FONTS_TIMESTAMP=20100401
+MAGYARLINUXLIBERTINE_FONTS_TIMESTAMP=20100512
AC_SUBST(MAGYARLINUXLIBERTINE_FONTS_TIMESTAMP)
OOO_BUILD_NOARCH="NO"
diff --git a/patches/dev300/magyarlinuxlibertine-fonts.diff b/patches/dev300/magyarlinuxlibertine-fonts.diff
index 853afb7..eb2d6cf 100644
--- a/patches/dev300/magyarlinuxlibertine-fonts.diff
+++ b/patches/dev300/magyarlinuxlibertine-fonts.diff
@@ -116,26 +116,18 @@ diff -Naur bitstream_vera_fonts.orig/fonts/ttf_magyarlinuxlibertine/makefile.mk
diff -Naur scp2.orig/source/ooo/file_font_ooo.scp scp2/source/ooo/file_font_ooo.scp
--- scp2/source/ooo/file_font_ooo.scp 2010-03-16 12:04:42.306375000 +0100
+++ scp2/source/ooo/file_font_ooo.scp 2010-03-19 13:02:02.527125000 +0100
-@@ -212,3 +212,22 @@
+@@ -212,3 +212,14 @@
STD_FONTWIN_FILE( gid_File_Fnt_thowr, thowr___.ttf, ThorndaleAMT)
#endif
#endif
+
+#ifndef WITHOUT_FONTS
+#ifdef WITH_MAGYARLINUXLIBERTINE_FONTS
-+STD_FONT_FILE( gid_File_Fnt_LinuxLibertineI, LinLibertineI.ttf, Linux Libertine I)
-+STD_FONT_FILE( gid_File_Fnt_LinuxLibertineN, LinLibertineN.ttf, Linux Libertine N)
-+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_MagyarLinLibertineI, MagyarLinLibertineI.ttf, Magyar Linux Libertine 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_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_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
+#endif
More information about the ooo-build-commit
mailing list