[Libreoffice-commits] .: Branch 'libreoffice-3-4' - configure.in scp2/source

[Tor Lillqvist]

 configure.in                      |   19 +++++++++++++++++++
 scp2/source/ooo/file_font_ooo.scp |   27 +++++++++++++++++++++++++++
 2 files changed, 46 insertions(+)

New commits:
commit e9cbbdc20c3a8c2d4748883be23d7cf5a7ecd457
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Apr 6 15:15:11 2011 +0300

    Add possibility to bundle some Agfa Monotype fonts
    
    Based on the old novell-win32-agfa-monotype-fonts.diff patch.

diff --git a/configure.in b/configure.in
index 0b89ffe..7dab161 100755
--- a/configure.in
+++ b/configure.in
@@ -577,6 +577,13 @@ AC_ARG_WITH(afms,
          are known to be available.]),
 ,)
 
+AC_ARG_WITH(agfa-monotype-fonts,
+     AS_HELP_STRING([--with-agfa-monotype-fonts],
+          [Do not include the proprietary Agfa Monotype fonts
+           (even if present) in the LibreOffice installation
+           set.])
+,)
+
 AC_ARG_WITH(epm,
     AS_HELP_STRING([--with-epm],
         [Decides which epm to use. Default is to use the one from the system if
@@ -7291,6 +7298,18 @@ else
 fi
 AC_SUBST(WITH_FONTS)
 
+AC_MSG_CHECKING([whether to include Agfa Monotype fonts])
+if test "$with_agfa_monotype_fonts" = "yes" ; then
+  AC_MSG_RESULT([yes])
+  WITH_AGFA_MONOTYPE_FONTS=YES
+  SCPDEFS="$SCPDEFS -DWITH_AGFA_MONOTYPE_FONTS"
+  BUILD_TYPE="$BUILD_TYPE AGFA_MONOTYPE_FONTS"
+else
+  AC_MSG_RESULT([no])
+  WITH_AGFA_MONOTYPE_FONTS=NO
+fi
+AC_SUBST(WITH_AGFA_MONOTYPE_FONTS)
+
 dnl ===================================================================
 dnl Test whether to include ppds
 dnl ===================================================================
diff --git a/scp2/source/ooo/file_font_ooo.scp b/scp2/source/ooo/file_font_ooo.scp
index ae1939c..8b42a94 100644
--- a/scp2/source/ooo/file_font_ooo.scp
+++ b/scp2/source/ooo/file_font_ooo.scp
@@ -160,3 +160,30 @@ End
 #endif
 #endif
 
+#ifdef WNT
+#ifdef WITH_AGFA_MONOTYPE_FONTS
+STD_FONTWIN_FILE( gid_File_Fnt_albw, albw.ttf, AlbanyAMT)
+STD_FONTWIN_FILE( gid_File_Fnt_albwb, albwb.ttf, AlbanyAMT Bold)
+STD_FONTWIN_FILE( gid_File_Fnt_albwbi, albwbi.ttf, AlbanyAMT Bold Italic)
+STD_FONTWIN_FILE( gid_File_Fnt_albwi, albwi.ttf, AlbanyAMT Italic)
+STD_FONTWIN_FILE( gid_File_Fnt_andybol, andybol_.ttf, AndyMT Bold)
+STD_FONTWIN_FILE( gid_File_Fnt_andyreg, andyreg_.ttf, AndyMT)
+STD_FONTWIN_FILE( gid_File_Fnt_ans, ans_____.ttf, Andale Sans)
+STD_FONTWIN_FILE( gid_File_Fnt_ansb, ansb____.ttf, Andale Sans Bold)
+STD_FONTWIN_FILE( gid_File_Fnt_ansbi, ansbi___.ttf, Andale Sans Bold Italic)
+STD_FONTWIN_FILE( gid_File_Fnt_ansi, ansi____.ttf, Andale Sans Italic)
+STD_FONTWIN_FILE( gid_File_Fnt_bl, bl______.ttf, BellMT)
+STD_FONTWIN_FILE( gid_File_Fnt_blb, blb_____.ttf, BellMT Bold)
+STD_FONTWIN_FILE( gid_File_Fnt_blbi, blbi____.ttf, BellMT Bold Italic)
+STD_FONTWIN_FILE( gid_File_Fnt_bli, bli_____.ttf, BellMT Italic)
+STD_FONTWIN_FILE( gid_File_Fnt_cumbwb, cumbwb__.ttf, CumberlandAMT Bold)
+STD_FONTWIN_FILE( gid_File_Fnt_cumbwbi, cumbwbi_.ttf, CumberlandAMT Bold Italic)
+STD_FONTWIN_FILE( gid_File_Fnt_cumbwi, cumbwi__.ttf, CumberlandAMT Italic)
+STD_FONTWIN_FILE( gid_File_Fnt_cumbwr, cumbwr__.ttf, CumberlandAMT)
+STD_FONTWIN_FILE( gid_File_Fnt_mtsorts, mtsorts_.ttf, Monotype Sorts)
+STD_FONTWIN_FILE( gid_File_Fnt_thowb, thowb___.ttf, ThorndaleAMT Bold)
+STD_FONTWIN_FILE( gid_File_Fnt_thowbi, thowbi__.ttf, ThorndaleAMT Bold Italic)
+STD_FONTWIN_FILE( gid_File_Fnt_thowi, thowi___.ttf, ThorndaleAMT Italic)
+STD_FONTWIN_FILE( gid_File_Fnt_thowr, thowr___.ttf, ThorndaleAMT)
+#endif
+#endif