Makefile.fetch | 3 +
Repository.mk | 3 +
download.lst | 6 +++
external/more_fonts/ExternalPackage_alef.mk | 17 ++++++++++
external/more_fonts/ExternalPackage_culmus.mk | 33 ++++++++++++++++++++
external/more_fonts/ExternalPackage_libre_hebrew.mk | 25 +++++++++++++++
external/more_fonts/Module_more_fonts.mk | 6 +++
external/more_fonts/UnpackedTarball_alef.mk | 14 ++++++++
external/more_fonts/UnpackedTarball_culmus.mk | 14 ++++++++
external/more_fonts/UnpackedTarball_libre_hebrew.mk | 14 ++++++++
sw/uiconfig/swriter/menubar/menubar.xml | 8 ++--
11 files changed, 139 insertions(+), 4 deletions(-)
New commits:
commit 85e2a27409f184c8504e61163dc741a31ccc5186
Author: Yousuf Philips <philip...@hotmail.com>
Date: Sat Dec 16 16:55:46 2017 +0400
tdf#113538 Add Hebrew fonts into default installation
Includes these fonts
* Alef
* David CLM
* David Libre
* Frank Ruehl CLM
* Frank Ruhl Hofshi
* Miriam CLM
* Miriam Libre
* Miriam Mono CLM
* Nachlieli CLM
* Rubik
Change-Id: Ib16a30c1f5b8fae372b3f9fc3f6de8a3be55bc85
Reviewed-on: https://gerrit.libreoffice.org/45101
Reviewed-by: Yousuf Philips <philip...@hotmail.com>
Tested-by: Yousuf Philips <philip...@hotmail.com>
Tested-by: Jenkins <c...@libreoffice.org>
(cherry picked from commit 4099b7628405e0ad16844eb59a916aa56ffa76ad)
Reviewed-on: https://gerrit.libreoffice.org/46752
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/Makefile.fetch b/Makefile.fetch
index e3095eee699f..33558239eeb8 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -177,6 +177,9 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk
$(SRCDIR)/download.lst $(S
$(call fetch_Optional,MORE_FONTS,FONT_SOURCESANS_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_EMOJIONE_COLOR_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_NOTO_TARBALL) \
+ $(call fetch_Optional,MORE_FONTS,FONT_CULMUS_TARBALL) \
+ $(call fetch_Optional,MORE_FONTS,FONT_LIBRE_HEBREW_TARBALL) \
+ $(call fetch_Optional,MORE_FONTS,FONT_ALEF_TARBALL) \
$(call fetch_Optional,MSPUB,MSPUB_TARBALL) \
$(call fetch_Optional,MWAW,MWAW_TARBALL) \
$(call
fetch_Optional,MYSQL_CONNECTOR_CPP,MYSQL_CONNECTOR_CPP_TARBALL) \
diff --git a/Repository.mk b/Repository.mk
index 4bc9a34d87dc..c3ccf4c16142 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -946,14 +946,17 @@ $(eval $(call
gb_Helper_register_packages_for_install,ooo_fonts,\
$(if $(USING_X11)$(ENABLE_HEADLESS)$(filter ANDROID,$(OS)), \
postprocess_fontconfig) \
$(call gb_Helper_optional,MORE_FONTS,\
+ fonts_alef \
fonts_caladea \
fonts_carlito \
+ fonts_culmus \
fonts_dejavu \
fonts_emojione_color \
fonts_gentium \
fonts_liberation \
fonts_liberation_narrow \
fonts_libertineg \
+ fonts_libre_hebrew \
fonts_noto \
fonts_sourcecode \
fonts_sourcesans \
diff --git a/download.lst b/download.lst
index 89f458c015e1..23ba942aa3bf 100644
--- a/download.lst
+++ b/download.lst
@@ -70,6 +70,12 @@ export FONT_EMOJIONE_COLOR_SHA256SUM :=
d1a08f7c10589f22740231017694af0a7a270760
export FONT_EMOJIONE_COLOR_TARBALL := EmojiOneColor-SVGinOT-1.3.tar.gz
export FONT_NOTO_SHA256SUM :=
8a269926a3c88dd14b124b19138b54408938a45ea6e60db65073469f45ae6ac8
export FONT_NOTO_TARBALL := noto-fonts-20170306.tar.gz
+export FONT_CULMUS_SHA256SUM :=
dcf112cfcccb76328dcfc095f4d7c7f4d2f7e48d0eed5e78b100d1d77ce2ed1b
+export FONT_CULMUS_TARBALL := culmus-0.131.tar.gz
+export FONT_LIBRE_HEBREW_SHA256SUM :=
f596257c1db706ce35795b18d7f66a4db99d427725f20e9384914b534142579a
+export FONT_LIBRE_HEBREW_TARBALL := libre-hebrew-1.0.tar.gz
+export FONT_ALEF_SHA256SUM :=
b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52
+export FONT_ALEF_TARBALL := alef-1.001.tar.gz
export FREEHAND_SHA256SUM :=
0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac
export FREEHAND_TARBALL := libfreehand-0.1.2.tar.xz
export FREETYPE_SHA256SUM :=
e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78
diff --git a/external/more_fonts/ExternalPackage_alef.mk
b/external/more_fonts/ExternalPackage_alef.mk
new file mode 100644
index 000000000000..f41aca483ef3
--- /dev/null
+++ b/external/more_fonts/ExternalPackage_alef.mk
@@ -0,0 +1,17 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_alef,font_alef))
+
+$(eval $(call
gb_ExternalPackage_add_unpacked_files,fonts_alef,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
+ Alef-Bold.ttf \
+ Alef-Regular.ttf \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/external/more_fonts/ExternalPackage_culmus.mk
b/external/more_fonts/ExternalPackage_culmus.mk
new file mode 100644
index 000000000000..ecbd7f70ec07
--- /dev/null
+++ b/external/more_fonts/ExternalPackage_culmus.mk
@@ -0,0 +1,33 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_culmus,font_culmus))
+
+$(eval $(call
gb_ExternalPackage_add_unpacked_files,fonts_culmus,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
+ DavidCLM-Bold.ttf \
+ DavidCLM-BoldItalic.ttf \
+ DavidCLM-Medium.ttf \
+ DavidCLM-MediumItalic.ttf \
+ FrankRuehlCLM-Bold.ttf \
+ FrankRuehlCLM-BoldOblique.ttf \
+ FrankRuehlCLM-Medium.ttf \
+ FrankRuehlCLM-MediumOblique.ttf \
+ MiriamCLM-Bold.ttf \
+ MiriamCLM-Book.ttf \
+ MiriamMonoCLM-Bold.ttf \
+ MiriamMonoCLM-BoldOblique.ttf \
+ MiriamMonoCLM-Book.ttf \
+ MiriamMonoCLM-BookOblique.ttf \
+ NachlieliCLM-Bold.otf \
+ NachlieliCLM-BoldOblique.otf \
+ NachlieliCLM-Light.otf \
+ NachlieliCLM-LightOblique.otf \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/external/more_fonts/ExternalPackage_libre_hebrew.mk
b/external/more_fonts/ExternalPackage_libre_hebrew.mk
new file mode 100644
index 000000000000..ec2bd0024187
--- /dev/null
+++ b/external/more_fonts/ExternalPackage_libre_hebrew.mk
@@ -0,0 +1,25 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call
gb_ExternalPackage_ExternalPackage,fonts_libre_hebrew,font_libre_hebrew))
+
+$(eval $(call
gb_ExternalPackage_add_unpacked_files,fonts_libre_hebrew,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
+ DavidLibre-Bold.ttf \
+ DavidLibre-Regular.ttf \
+ FrankRuhlHofshi-Bold.otf \
+ FrankRuhlHofshi-Regular.otf \
+ MiriamLibre-Bold.otf \
+ MiriamLibre-Regular.otf \
+ Rubik-Bold.ttf \
+ Rubik-BoldItalic.ttf \
+ Rubik-Italic.ttf \
+ Rubik-Regular.ttf \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/external/more_fonts/Module_more_fonts.mk
b/external/more_fonts/Module_more_fonts.mk
index 760f066fbbfa..d86d7b4c5e75 100644
--- a/external/more_fonts/Module_more_fonts.mk
+++ b/external/more_fonts/Module_more_fonts.mk
@@ -10,24 +10,30 @@
$(eval $(call gb_Module_Module,more_fonts))
$(eval $(call gb_Module_add_targets,more_fonts,\
+ ExternalPackage_alef \
ExternalPackage_caladea \
ExternalPackage_carlito \
+ ExternalPackage_culmus \
ExternalPackage_dejavu \
ExternalPackage_gentium \
ExternalPackage_liberation \
ExternalPackage_liberation_narrow \
ExternalPackage_libertineg \
+ ExternalPackage_libre_hebrew \
ExternalPackage_sourcecode \
ExternalPackage_sourcesans \
ExternalPackage_noto \
ExternalPackage_EmojiOne_Color \
+ UnpackedTarball_alef \
UnpackedTarball_caladea \
UnpackedTarball_carlito \
+ UnpackedTarball_culmus \
UnpackedTarball_dejavu \
UnpackedTarball_gentium \
UnpackedTarball_liberation \
UnpackedTarball_liberation_narrow \
UnpackedTarball_libertineg \
+ UnpackedTarball_libre_hebrew \
UnpackedTarball_sourcecode \
UnpackedTarball_sourcesans \
UnpackedTarball_noto \
diff --git a/external/more_fonts/UnpackedTarball_alef.mk
b/external/more_fonts/UnpackedTarball_alef.mk
new file mode 100644
index 000000000000..fbabe9fecc15
--- /dev/null
+++ b/external/more_fonts/UnpackedTarball_alef.mk
@@ -0,0 +1,14 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,font_alef))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,font_alef,$(FONT_ALEF_TARBALL)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/external/more_fonts/UnpackedTarball_culmus.mk
b/external/more_fonts/UnpackedTarball_culmus.mk
new file mode 100644
index 000000000000..3b776ed5c084
--- /dev/null
+++ b/external/more_fonts/UnpackedTarball_culmus.mk
@@ -0,0 +1,14 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,font_culmus))
+
+$(eval $(call
gb_UnpackedTarball_set_tarball,font_culmus,$(FONT_CULMUS_TARBALL)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/external/more_fonts/UnpackedTarball_libre_hebrew.mk
b/external/more_fonts/UnpackedTarball_libre_hebrew.mk
new file mode 100644
index 000000000000..1d6c56166179
--- /dev/null
+++ b/external/more_fonts/UnpackedTarball_libre_hebrew.mk
@@ -0,0 +1,14 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,font_libre_hebrew))
+
+$(eval $(call
gb_UnpackedTarball_set_tarball,font_libre_hebrew,$(FONT_LIBRE_HEBREW_TARBALL)))
+
+# vim: set noet sw=4 ts=4:
commit 0ad84cb95887096731ad48c65a29547660658c01
Author: Yousuf Philips <philip...@hotmail.com>
Date: Tue Dec 19 23:13:10 2017 +0400
tdf#91781 Round of improvements to Writer's menus for 6.0 (2)
Change-Id: I33a2ab28c27c9c2203c5f4ee66000af2cd357891
Reviewed-on: https://gerrit.libreoffice.org/46814
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml
b/sw/uiconfig/swriter/menubar/menubar.xml
index bcb83ff39972..f78f75a05e97 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -275,7 +275,9 @@
<menu:menuitem menu:id=".uno:FlowChartShapes"/>
</menu:menupopup>
</menu:menu>
- <menu:menuitem menu:id=".uno:FontworkGalleryFloater"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:InsertSection"/>
+ <menu:menuitem menu:id=".uno:InsertDoc"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:DrawText"/>
<menu:menuitem menu:id=".uno:InsertAnnotation"/>
@@ -287,6 +289,7 @@
</menu:menupopup>
</menu:menu>
<menu:menuitem menu:id=".uno:InsertCaptionDialog"/>
+ <menu:menuitem menu:id=".uno:FontworkGalleryFloater"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:HyperlinkDialog"/>
<menu:menuitem menu:id=".uno:InsertBookmark"/>
@@ -330,10 +333,7 @@
</menu:menupopup>
</menu:menu>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:InsertSection"/>
<menu:menuitem menu:id=".uno:InsertEnvelope"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:InsertDoc"/>
</menu:menupopup>
</menu:menu>
<menu:menu menu:id=".uno:FormatMenu">
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
