[Libreoffice-commits] .: 2 commits - bin/font-munge.in bin/.gitignore bin/help-font-munge.in bin/Makefile.am bin/transform configure.in Makefile.am patches/dev300
Tor Lillqvist
tml at kemper.freedesktop.org
Wed Nov 3 05:21:58 PDT 2010
Makefile.am | 7 -
bin/.gitignore | 2
bin/Makefile.am | 3
bin/font-munge.in | 164 --------------------------------------
bin/help-font-munge.in | 78 ------------------
bin/transform | 37 --------
configure.in | 2
patches/dev300/apply | 5 -
patches/dev300/hebrew-culmus.diff | 44 ----------
9 files changed, 1 insertion(+), 341 deletions(-)
New commits:
commit 2867f617125550d582f232f8064befc994701ab0
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Wed Nov 3 14:18:57 2010 +0200
Apply hebrew-culmus.diff to the repos
I already applied the font-munge script to the same VCL.xcu file
anyway.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 787fdd9..e3979f5 100755
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -840,11 +840,6 @@ system-python-uno-path.diff, i#97629
liberation_packaging_fix.diff, kami
#liberation_making_fix.diff, kami
-[ VCL ]
-# prioritize hebrew culmus fonts, Debian bugs #280084, #296152, #300642
-hebrew-culmus.diff, noelpwer
-
-
[ AddressBooks ]
# build either the driver for Evolution 1.x or 2.x
# they produce the same binary and configuration, so they can't be built at once
diff --git a/patches/dev300/hebrew-culmus.diff b/patches/dev300/hebrew-culmus.diff
deleted file mode 100644
index 71af5c8..0000000
--- a/patches/dev300/hebrew-culmus.diff
+++ /dev/null
@@ -1,44 +0,0 @@
----
- officecfg/registry/data/org/openoffice/VCL.xcu | 14 +++++++-------
- 1 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git officecfg/registry/data/org/openoffice/VCL.xcu officecfg/registry/data/org/openoffice/VCL.xcu
-index 739e14f..e079430 100644
---- officecfg/registry/data/org/openoffice/VCL.xcu
-+++ officecfg/registry/data/org/openoffice/VCL.xcu
-@@ -472,25 +472,25 @@
- </node>
- <node oor:name="he" oor:op="replace">
- <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
-- <value>tahoma;nachlieli;lucidagrande;lucidasans;supplement;Andale Sans UI;arialunicodems;lucidasansunicode;interfaceuser;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany;Lucida;Helvetica;Charcoal;Chicago;Arial;Helmet;Interface System;Sans Serif</value>
-+ <value>Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;tahoma;nachlieli;lucidagrande;lucidasans;supplement;Andale Sans UI;arialunicodems;lucidasansunicode;interfaceuser;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Helvetica;Charcoal;Chicago;Arial;Helmet;Interface System;Sans Serif</value>
- </prop>
- <prop oor:name="SANS_UNICODE" oor:type="xs:string" oor:op="replace">
-- <value>lucidasans;arialunicodems;lucidasansunicode;tahoma;nachlieli;lucidagrande;clearlyu;lucida;sansserif</value>
-+ <value>Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;lucidasans;arialunicodems;lucidasansunicode;tahoma;nachlieli;lucidagrande;clearlyu;lucida;sansserif</value>
- </prop>
- <prop oor:name="CTL_DISPLAY" oor:type="xs:string" oor:op="replace">
-- <value>tahoma;nachlieli;lucidagrande;lucidasans;arialunicodems</value>
-+ <value>Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;tahoma;nachlieli;lucidagrande;lucidasans;arialunicodems</value>
- </prop>
- <prop oor:name="CTL_HEADING" oor:type="xs:string" oor:op="replace">
-- <value>tahoma;nachlieli;lucidagrande;lucidasans;arialunicodems</value>
-+ <value>Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;tahoma;nachlieli;lucidagrande;lucidasans;arialunicodems</value>
- </prop>
- <prop oor:name="CTL_PRESENTATION" oor:type="xs:string" oor:op="replace">
-- <value>tahoma;nachlieli;lucidagrande;lucidasans;arialunicodems</value>
-+ <value>Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;tahoma;nachlieli;lucidagrande;lucidasans;arialunicodems</value>
- </prop>
- <prop oor:name="CTL_SPREADSHEET" oor:type="xs:string" oor:op="replace">
-- <value>tahoma;nachlieli;lucidagrande;lucidasans;arialunicodems</value>
-+ <value>Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;tahoma;nachlieli;lucidagrande;lucidasans;arialunicodems</value>
- </prop>
- <prop oor:name="CTL_TEXT" oor:type="xs:string" oor:op="replace">
-- <value>tahoma;nachlieli;lucidagrande;lucidasans;arialunicodems</value>
-+ <value>Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;tahoma;nachlieli;lucidagrande;lucidasans;arialunicodems</value>
- </prop>
- </node>
- <node oor:name="th" oor:op="replace">
---
-1.7.0.1
-
commit 62580f80ac47c88694fcf8c4ec0861c45fddd14f
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Wed Nov 3 13:45:29 2010 +0200
Drop bin/transform, font-munge and help-font-munge
Those changes have now been done in the appropriate files in the repos
directly.
diff --git a/Makefile.am b/Makefile.am
index e543251..6ac2dcf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,7 +36,6 @@ STAMP_DIR=$(top_builddir)/stamp
unpack : $(OOBUILDDIR)/unpack $(top_srcdir)/bin/unpack
$(OOBUILDDIR)/unpack :
- $(TOOLSDIR)/bin/transform --revert $(TOOLSDIR) $(OOBUILDDIR)
test -n "$(OOO_GIT_MANAGED)" && $(TOOLSDIR)/bin/gob --build-dir=$(OOBUILDDIR) prepare || true
if test -d $(OOBUILDDIR)/applied_patches ; then \
FLAGS=`$(TOOLSDIR)/bin/applyflags $(TOOLSDIR)/bin` ; \
@@ -71,20 +70,17 @@ $(STAMP_DIR)/patch.apply : $(top_srcdir)/patches/apply.pl \
$(OOBUILDDIR)/external/unicows/*.dll || true; \
fi
- $(TOOLSDIR)/bin/transform --revert $(TOOLSDIR) $(OOBUILDDIR)
test -n "$(OOO_GIT_MANAGED)" && $(TOOLSDIR)/bin/gob --build-dir=$(OOBUILDDIR) prepare || true
FLAGS=`$(TOOLSDIR)/bin/applyflags $(TOOLSDIR)/bin` ; \
CURSOURCE=$(OOO_SOURCEDIRNAME); test -f $(OOBUILDDIR)/.source && CURSOURCE=`cat $(OOBUILDDIR)/.source`; \
chmod +x $(TOOLSDIR)/patches/apply.pl && $(TOOLSDIR)/patches/apply.pl $(APPLY_DIR) $(OOBUILDDIR) $$FLAGS --tag=$$CURSOURCE ;
test -n "$(OOO_GIT_MANAGED)" && $(TOOLSDIR)/bin/gob --build-dir=$(OOBUILDDIR) postpare || true
- $(TOOLSDIR)/bin/transform --apply $(TOOLSDIR) $(OOBUILDDIR)
test -n "$(OOO_GIT_MANAGED)" && cd $(OOBUILDDIR) && git commit -am 'Font munging.' || true
$(TOOLSDIR)/bin/fix-deps $(OOBUILDDIR)
rm -f $(STAMP_DIR)/build
touch $@
patch.unapply:
- $(TOOLSDIR)/bin/transform --revert $(TOOLSDIR) $(OOBUILDDIR)
FLAGS=`$(TOOLSDIR)/bin/applyflags $(TOOLSDIR)/bin` ; \
chmod +x $(TOOLSDIR)/patches/apply.pl && $(TOOLSDIR)/patches/apply.pl $(APPLY_DIR) $(OOBUILDDIR) $$FLAGS -R ;
rm -f $(STAMP_DIR)/patch.apply
@@ -98,7 +94,6 @@ refresh: $(STAMP_DIR)/refresh
$(STAMP_DIR)/refresh : $(CLONEDIR)/repos_changed
echo $(OOO_GIT)
if test "z$(OOO_GIT)" != "z" ; then \
- $(TOOLSDIR)/bin/transform --revert $(TOOLSDIR) $(OOBUILDDIR) ; \
FLAGS=`$(TOOLSDIR)/bin/applyflags $(TOOLSDIR)/bin` ; \
chmod +x $(TOOLSDIR)/patches/apply.pl && $(TOOLSDIR)/patches/apply.pl $(APPLY_DIR) $(OOBUILDDIR) $$FLAGS -R ; \
echo "Rsyncing changes from the repos to the build tree - [ go and have some $(DRINK) ] ..." ; \
@@ -198,7 +193,7 @@ test: $(BUILDDIR)/install/program/ooenv
bin/run-tests.sh $(BUILDDIR)/install
vtable_check:
- $(TOOLSDIR)/bin/transform --lo-path=$(OOBUILDDIR)
+ $(TOOLSDIR)/bin/vtable-check --lo-path=$(OOBUILDDIR)
help:
@echo "-----------------------------------------------------------------------------------"
diff --git a/bin/.gitignore b/bin/.gitignore
index fb8a0fc..146f275 100644
--- a/bin/.gitignore
+++ b/bin/.gitignore
@@ -1,3 +1 @@
-font-munge
-help-font-munge
setup
diff --git a/bin/Makefile.am b/bin/Makefile.am
index 058cc72..628b964 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -11,10 +11,8 @@ script_files = \
defuzzpatch \
extract-gsi \
extract-new-strings \
- font-munge \
fix-deps \
generate-bash-completion \
- help-font-munge \
install-dictionaries \
install-mono \
install-sdk \
@@ -43,7 +41,6 @@ script_files = \
unopkg-regenerate-cache \
unpack \
setup.in \
- transform \
sloppypatch.pl \
README
diff --git a/bin/font-munge.in b/bin/font-munge.in
deleted file mode 100644
index 067c601..0000000
--- a/bin/font-munge.in
+++ /dev/null
@@ -1,164 +0,0 @@
-#!@PERL@ -pi.bak -w
-
-BEGIN { $ENV{OOO_VENDOR} ||= "unknown"; $uisans = 0; $uifixed = 0; }
-
-# This does a partial substitution of the really
-# mechanical bits of our fonts.
-
- # make sure that the MS compatible fonts like Albany, Arial are preferred
- # over the Bitstream Vera fonts
-
- s/(Bitstream Vera Sans;.*)Albany;/Albany;$1/;
- s/(Bitstream Vera Sans;.*)Arial;/Arial;$1/;
- s/(Bitstream Vera Sans Mono;.*)Cumberland;/Cumberland;$1/;
- s/(Bitstream Vera Sans Mono;.*)Courier New;/Courier New;$1/;
- s/(Bitstream Vera Serif;.*)Thorndale;/Thorndale;$1/;
- s/(Bitstream Vera Serif;.*)Times New Roman;/Times New Roman;$1/;
-
- # Add the Indic fonts bundled with Windows XP. They are preferred
- # to Arial Unicode MS which doesn't even come with Windows, but with
- # Office, so how would typical OOo users have it?
- # The fonts:
- # Gautami, for Telugu
- # Kartika, for Malayalam
- # Tunga, for Kannada
- # are not added because the languages that the corresponding
- # scripts aren't mentioned in VCL.xcu.
-
- # Mangal is for the Devanagari script, VCL.xcu has only Hindi of
- # the languages that are written in Devanagari
- (m/Mangal;/) || s/Lohit Hindi;/Mangal;Lohit Hindi;/;
- # Shruti is for Gujarati
- (m/Shruti;/) || s/Lohit Gujarati;/Shruti;Lohit Gujarati;/;
- # Latha is for Tamil
- (m/Latha;/) || s/Lohit Tamil;/Latha;Lohit Tamil;/;
- # Raavi is for the Gurmukhi script, in which Punjabi is written in
- # India
- (m/Raavi;/) || s/Lohit Punjabi;/Raavi;Lohit Punjabi;/;
- # Vrinda is for Bengali
- (m/Vrinda;/) || s/Lohit Bengali;/Vrinda;Lohit Bengali;/;
-
- # add Albany, Cumberland, and Thorndale
- (m/Albany;/) || s/Arial;/Albany;Arial;/g;
- (m/albany;/) || s/arial;/albany;arial;/g;
- (m/Thorndale;/) || s/Times New Roman;/Thorndale;Times New Roman;/g;
- (m/thorndale;/) || s/timesnewroman;/thorndale;timesnewroman;/g;
- (m/Cumberland;/) || s/Courier New;/Cumberland;Courier New;/g;
- (m/cumberland;/) || s/couriernew;/cumberland;couriernew;/g;
-
- # add AMT fonts
- (m/Albany AMT;/) || s/Albany;/Albany AMT;Albany;/g;
- (m/albanyamt;/) || s/albany;/albanyamt;albany;/g;
- (m/Thorndale AMT;/) || s/Thorndale;/Thorndale AMT;Thorndale;/g;
- (m/thorndaleamt;/) || s/thorndale;/thorndaleamt;thorndale;/g;
- (m/Cumberland AMT;/) || s/Cumberland;/Cumberland AMT;Cumberland;/g;
- (m/cumberlandamt;/) || s/cumberland;/cumberlandamt;cumberland;/g;
- (m/andymt;/) || s/comicsansms;/andymt;comicsansms;/g;
- (m/andy;/) || s/kidprint;/andy;kidprint;/g;
-
-# New bits from SUSE:
-
- # add Nimbus fonts
- (m/Nimbus Sans L;/) || s/Arial;/Arial;Nimbus Sans L;/g;
- (m/nimbussansl;/) || s/arial;/arial;nimbussansl;/g;
- (m/Nimbus Roman No9 L;/) || s/Times New Roman;/Times New Roman;Nimbus Roman No9 L;/g;
- (m/nimbusromanno9l;/) || s/timesnewroman;/timesnewroman;nimbusromanno9l;/g;
- (m/Nimbus Mono L;/) || s/Courier New;/Courier New;Nimbus Mono L;/g;
- (m/nimbusmonol;/) || s/couriernew;/couriernew;nimbusmonol;/g;
-
-
-# prune duplicates
-
- s/Albany AMT;(.*)Albany AMT;/Albany AMT;$1/;
- s/Albany;(.*)Albany;/Albany;$1/;
- s/Arial;(.*)Arial;/Arial;$1/;
- s/Nimbus Sans L;(.*)Nimbus Sans L;/Nimbus Sans L;$1/;
-
- s/albanyamt;(.*)albanyamt;/albanyamt;$1/;
- s/albany;(.*)albany;/albany;$1/;
- s/arial;(.*)arial;/arial;$1/;
- s/nimbussansl;(.*)nimbussansl;/nimbussansl;$1/;
-
- s/Thorndale AMT;(.*)Thorndale AMT;/Thorndale AMT;$1/;
- s/Thorndale;(.*)Thorndale;/Thorndale;$1/;
- s/Times New Roman;(.*)Times New Roman;/Times New Roman;$1/;
- s/Nimbus Roman No9 L;(.*)Nimbus Roman No9 L;/Nimbus Roman No9 L;$1/;
-
- s/thorndaleamt;(.*)thorndaleamt;/thorndaleamt;$1/;
- s/thorndale;(.*)thorndale;/thorndale;$1/;
- s/timesnewroman;(.*)timesnewroman;/timesnewroman;$1/;
- s/nimbusromanno9l;(.*)nimbusromanno9l;/nimbusromanno9l;$1/;
-
- s/Cumberland AMT;(.*)Cumberland AMT;/Cumberland AMT;$1/;
- s/Cumberland;(.*)Cumberland;/Cumberland;$1/;
- s/Courier New;(.*)Courier New;/Courier New;$1/;
- s/Nimbus Mono L;(.*)Nimbus Mono L;/Nimbus Mono L;$1/;
-
- s/cumberlandamt;(.*)cumberlandamt;/cumberlandamt;$1/;
- s/cumberland;(.*)cumberland;/cumberland;$1/;
- s/couriernew;(.*)couriernew;/couriernew;$1/;
- s/nimbusmonol;(.*)nimbusmonol;/nimbusmonol;$1/;
-
-
- # sort fonts AMT over Albany... over MS over Nimbus over bitmap
-
- s/(Helvetica;.*)Nimbus Sans L;/Nimbus Sans L;$1/;
- s/(Nimbus Sans L;.*)Arial;/Arial;$1/;
- s/(Arial;.*)Albany;/Albany;$1/;
- s/(Albany;.*)Albany AMT;/Albany AMT;$1/;
-
- s/(helvetica;.*)nimbussansl;/nimbussansl;$1/;
- s/(nimbussansl;.*)arial;/arial;$1/;
- s/(arial;.*)albany;/albany;$1/;
- s/(albany;.*)albanyamt;/albanyamt;$1/;
-
- s/(Times;.*)Nimbus Roman No9 L;/Nimbus Roman No9 L;$1/;
- s/(Nimbus Roman No9 L;.*)Times New Roman;/Times New Roman;$1/;
- s/(Times New Roman;.*)Thorndale;/Thorndale;$1/;
- s/(Thorndale;.*)Thorndale AMT;/Thorndale AMT;$1/;
-
- s/(times;.*)nimbusromanno9l;/nimbusromanno9l;$1/;
- s/(nimbusromanno9l;.*)timesnewroman;/timesnewroman;$1/;
- s/(timesnewroman;.*)thorndale;/thorndale;$1/;
- s/(thorndale;.*)thorndaleamt;/thorndaleamt;$1/;
-
- s/(Courier;.*)Nimbus Mono L;/Nimbus Mono L;$1/;
- s/(Nimbus Mono L;.*)Courier New;/Courier New;$1/;
- s/(Courier New;.*)Cumberland;/Cumberland;$1/;
- s/(Cumberland;.*)Cumberland AMT;/Cumberland AMT;$1/;
-
- s/(courier;.*)nimbusmonol;/nimbusmonol;$1/;
- s/(nimbusmonol;.*)couriernew;/couriernew;$1/;
- s/(couriernew;.*)cumberland;/cumberland;$1/;
- s/(cumberland;.*)cumberlandamt;/cumberlandamt;$1/;
-
-# Some RedHat CJK bits
-
- # Backups for Sung Ti
- s/æ–¹æ£å®‹ä½“;/æ–¹æ£å®‹ä½“;ZYSong18030;AR PL SungtiL GB;/g;
- # Backups for Ming Ti
- s/æ–¹æ£æ˜Žé«”;/æ–¹æ£æ˜Žé«”;AR PL Mingti2L Big5;/g;
-
- # Korean fixes
- s/SunGulim;/SunGulim;Baekmuk Gulim;/g;
- s/SunBatang;/SunBatang;Baekmuk Batang;/g;
- s/SunDotum;/SunDotum;Baekmuk Dotum;/g;
-
- # The bitstream fonts never make sense _at all_ they are so metrically odd.
- s/Bitstream Vera Sans;//g;
- s/Bitstream Vera Sans Mono;//g;
- s/Bitstream Vera Serif;//g;
-
-# Some Ubuntu bits
-
- # push SansSerif to the end of the list, some Tamil fonts don't
- # have all ISO-8859-1 characters defined
- s/SansSerif;(.*)</$1;SansSerif</;
-
- if ($ENV{OOO_VENDOR} =~ /buntu/) {
- # prefer DejaVu as UI font
- if ($uisans) { s/<value>/<value>DejaVuSans;/; };
- if (/UI_SANS/) { $uisans = 1; } else { $uisans = 0; };
- if ($uifixed) { s/<value>/<value>DejaVuMonoSans;/; };
- if (/UI_FIXED/) { $uifixed = 1; } else { $uifixed = 0; };
- };
diff --git a/bin/help-font-munge.in b/bin/help-font-munge.in
deleted file mode 100755
index 67e1871..0000000
--- a/bin/help-font-munge.in
+++ /dev/null
@@ -1,78 +0,0 @@
-#!@PERL@ -pi.bak -w
-
-BEGIN { $ENV{OOO_VENDOR} ||= "unknown"; $helpsans = 0; $helpfixed = 0; }
-
-# This does a partial substitution of the really
-# mechanical bits of our fonts in help content.
-
- # move Bitstream Vera fonts after better fonts
- s/\"Bitstream Vera Sans\"\,(.*Albany\,)/$1\"Bitstream Vera Sans\"\,/;
- s/\"Bitstream Vera Sans\"\,(.*\"Albany AMT\"\,)/$1\"Bitstream Vera Sans\"\,/;
- s/\"Bitstream Vera Sans\"\,(.*Arial\,)/$1\"Bitstream Vera Sans\"\,/;
- s/\"Bitstream Vera Sans\"\,(.*\"Nimbus Sans L\"\,)/$1\"Bitstream Vera Sans\"\,/;
-
- s/\"Bitstream Vera Sans Mono\"\,(.*Cumberland\,)/$1\"Bitstream Vera Sans Mono\"\,/;
- s/\"Bitstream Vera Sans Mono\"\,(.*\"Courier New\"\,)/$1\"Bitstream Vera Sans Mono\"\,/;
- s/\"Bitstream Vera Sans Mono\"\,(.*\"Cumberland AMT\"\,)/$1\"Bitstream Vera Sans Mono\"\,/;
- s/\"Bitstream Vera Sans Mono\"\,(.*\"Nimbus Mono L\"\,)/$1\"Bitstream Vera Sans Mono\"\,/;
-
- s/\"Bitstream Vera Serif\"\,(.*Thorndale\,)/$1\"Bitstream Vera Serif\"\,/;
- s/\"Bitstream Vera Serif\"\,(.*\"Thorndale AMT\"\,)/$1\"Bitstream Vera Serif\"\,/;
- s/\"Bitstream Vera Serif\"\,(.*\"Times New Roman\"\,)/$1\"Bitstream Vera Serif\"\,/;
- s/\"Bitstream Vera Serif\"\,(.*\"Nimbus Roman No9 L\"\,)/$1\"Bitstream Vera Serif\"\,/;
-
- # make sure Albany, Cumberland, and Thorndale are there
- (m/Albany,/) || s/Arial,/Albany,Arial,/g;
- (m/Cumberland,/) || s/\"Courier New\",/Cumberland,\"Courier New\",/g;
- (m/Thorndale,/) || s/\"Times New Roman\",/Thorndale,\"Times New Roman\",/g;
-
- # add AMT fonts
- (m/\"Albany AMT\",/) || s/Albany,/\"Albany AMT\",Albany,/g;
- (m/\"Cumberland AMT\",/) || s/Cumberland,/\"Cumberland AMT\",Cumberland,/g;
- (m/\"Thorndale AMT\",/) || s/Thorndale,/\"Thorndale AMT\",Thorndale,/g;
-
- # add URW fonts
- (m/\"Nimbus Sans L\",/) || s/Arial,/Arial,\"Nimbus Sans L\",/g;
- (m/\"Nimbus Mono L\",/) || s/\"Courier New\",/\"Courier New\",\"Nimbus Mono L\",/g;
- (m/\"Nimbus Roman No9 L\",/) || s/\"Times New Roman\",/\"Times New Roman\",\"Nimbus Roman No9 L\",/g;
-
- # prune duplicates
- s/Albany,(.*)Albany,/Albany,$1/;
- s/Cumberland,(.*)Cumberland,/Cumberland,$1/;
- s/Thorndale,(.*)Thorndale,/Thorndale,$1/;
-
- s/\"Albany AMT\",(.*)\"Albany AMT\",/\"Albany AMT\",$1/;
- s/\"Cumberland AMT\",(.*)\"Cumberland AMT\",/\"Cumberland AMT\",$1/;
- s/\"Thorndale AMT\",(.*)\"Thorndale AMT\",/\"Thorndale AMT\",$1/;
-
- s/\"Nimbus Sans L\",(.*)\"Nimbus Sans L\",/\"Nimbus Sans L\",$1/;
- s/\"Nimbus Mono L\",(.*)\"Nimbus Mono L\",/\"Nimbus Mono L\",$1/;
- s/\"Nimbus Roman No9 L\",(.*)\"Nimbus Roman No9 L\",/\"Nimbus Roman No9 L\",$1/;
-
- # sort fonts AMT over Albany... over MS over Nimbus over bitmap
- s/(Helvetica\,.*)\"Nimbus Sans L\"\,/\"Nimbus Sans L\"\,$1/;
- s/(\"Nimbus Sans L\"\,.*)Arial\,/Arial\,$1/;
- s/(Arial\,.*)Albany\,/Albany\,$1/;
- s/(Albany\,.*)\"Albany AMT\"\,/\"Albany AMT\"\,$1/;
-
- s/(Times\,.*)\"Nimbus Roman No9 L\"\,/\"Nimbus Roman No9 L\"\,$1/;
- s/(\"Nimbus Roman No9 L\"\,.*)\"Times New Roman\"\,/\"Times New Roman\"\,$1/;
- s/(\"Times New Roman\"\,.*)Thorndale\,/Thorndale\,$1/;
- s/(Thorndale\,.*)\"Thorndale AMT\"\,/\"Thorndale AMT\"\,$1/;
-
- s/(Courier\,.*)\"Nimbus Mono L\"\,/\"Nimbus Mono L\"\,$1/;
- s/(\"Nimbus Mono L\"\,.*)\"Courier New\"\,/\"Courier New\"\,$1/;
- s/(\"Courier New\"\,.*)Cumberland\,/Cumberland\,$1/;
- s/(Cumberland\,.*)\"Cumberland AMT\"\,/\"Cumberland AMT\"\,$1/;
-
- # push SansSerif to the end of the list, some Tamil fonts don't
- # have all ISO-8859-1 characters defined
- s/sans-serif,(.*);/$1,sans-serif;/;
-
- if ($ENV{OOO_VENDOR} =~ /buntu/) {
- # prefer DejaVu for the Help
- if ($helpsans) { s/font-family: */font-family: DejaVuSans,/; };
- if (/^body/) { $helpsans = 1; } else { $helpsans = 0; };
- if ($helpfixed) { s/font-family: */font-family: DejaVuMonoSans,/; };
- if (/^\.code/) { $helpfixed = 1; } else { $helpfixed = 0; };
- };
diff --git a/bin/transform b/bin/transform
deleted file mode 100755
index d505ef9..0000000
--- a/bin/transform
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-#
-# This makes rule re-use without acute pain in
-# a Makefile possible.
-#
-
-command=$1
-TOOLSDIR=$2
-OOBUILDDIR=$3;
-
-FONTMUNGE_FILE=$OOBUILDDIR/officecfg/registry/data/org/openoffice/VCL.xcu
-
-if test "z$command" = "z--apply"; then
-# apply
- echo "Munging font mappings ..."
- cp $FONTMUNGE_FILE "$FONTMUNGE_FILE.bak"
- $TOOLSDIR/bin/font-munge $FONTMUNGE_FILE
- $TOOLSDIR/bin/help-font-munge $OOBUILDDIR/helpcontent2/source/auxiliary/*/*.css
- echo "done munging fonts."
-
-elif test "z$command" = "z--revert"; then
-# revert
- echo "Revert font mapping munging ..."
- if test -f $FONTMUNGE_FILE.bak; then
- mv -f $FONTMUNGE_FILE.bak $FONTMUNGE_FILE;
- fi
- for cssfile in $OOBUILDDIR/helpcontent2/source/auxiliary/*/*.css ; do
- if test -f $cssfile.bak ; then
- mv -f $cssfile.bak $cssfile;
- fi;
- done
-
-else
-# error / help
- echo "Unknown option $command; try --apply or --revert <OOBUILDDIR>";
-fi
diff --git a/configure.in b/configure.in
index 29f245f..cf26c86 100755
--- a/configure.in
+++ b/configure.in
@@ -1658,8 +1658,6 @@ fi
AC_MSG_RESULT([$OOO_ADDITIONAL_SECTIONS])
AC_SUBST(OOO_ADDITIONAL_SECTIONS)
-AC_CONFIG_FILES([bin/font-munge], [chmod +x bin/font-munge])
-AC_CONFIG_FILES([bin/help-font-munge], [chmod +x bin/help-font-munge])
AC_CONFIG_FILES([download], [chmod +x download])
AC_CONFIG_FILES([scratch/place], [chmod +x scratch/place])
AC_CONFIG_FILES([intltool-extract intltool-merge intltool-update], [chmod +x intltool*])
More information about the Libreoffice-commits
mailing list