Changeset 385d02 in indico

Timestamp:

12/15/09 15:38:23 (4 years ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, new-webex, prov-dual-interface, v0.97-series, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, b8c30da8ebdbdcbd675a873997cc3e95f567de49, 4287315ec967a3da168d83963c14001db8487d53

Children:

bbd65a, f3d0f4

Parents:

c6cd5e

git-author:

Pedro Ferreira <jose.pedro.ferreira@…> (12/15/09 15:25:31)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (12/15/09 15:38:23)

Message:

[FIXED] Removed proprietary fonts

• Added support for new cds-indico-extra package that will contain the fonts

Location:

indico/MaKaC

Files:

• PDFinterface/base.py (modified) (1 diff)
• PDFinterface/conference.py (modified) (2 diffs)
• webinterface/tpls/ConfModifPosterDesign.tpl (modified) (1 diff)

indico/MaKaC/PDFinterface/base.py

@@ -133 +133 @@
 
 def setTTFonts():
-    dir=os.path.split(os.path.abspath(__file__))[0]
-    dir=os.path.join(dir, "ttfonts")
-    #pdfmetrics.registerFont(TTFont('symbol', os.path.join(dir,'symbol.ttf')))
-    pdfmetrics.registerFont(TTFont('Times-Roman', os.path.join(dir,'times.ttf')))
-    pdfmetrics.registerFont(TTFont('Times-Bold', os.path.join(dir, 'timesbd.ttf')))
-    pdfmetrics.registerFont(TTFont('Times-Italic', os.path.join(dir,'timesi.ttf')))
-    pdfmetrics.registerFont(TTFont('Times-Bold-Italic', os.path.join(dir, 'timesbi.ttf')))
-    pdfmetrics.registerFont(TTFont('Courier', os.path.join(dir, 'cour.ttf')))
-    pdfmetrics.registerFont(TTFont('Courier-Bold', os.path.join(dir, 'courbd.ttf')))
-    pdfmetrics.registerFont(TTFont('Courier-Italic', os.path.join(dir, 'couri.ttf')))
-    pdfmetrics.registerFont(TTFont('Courier-Bold-Italic', os.path.join(dir, 'courbi.ttf')))
-    pdfmetrics.registerFont(TTFont('OhMyGodStars', os.path.join(dir, 'OhMyGodStars.ttf')))
-    pdfmetrics.registerFont(TTFont('Optima-Thin', os.path.join(dir, 'Optima-Thin.ttf')))
-    #pdfmetrics.registerFont(TTFont('Bitstream-Cyberbit', os.path.join(dir, 'Cyberbit.ttf')))
-    pdfmetrics.registerFont(TTFont('LinuxLibertine', os.path.join(dir, 'LinLibertine_Re-2.8.14.ttf')))
-    pdfmetrics.registerFont(TTFont('LinuxLibertine-Bold', os.path.join(dir, 'LinLibertine_Bd-2.8.1.ttf')))
-    pdfmetrics.registerFont(TTFont('LinuxLibertine-Italic', os.path.join(dir, 'LinLibertine_BI-2.8.0.ttf')))
-    pdfmetrics.registerFont(TTFont('LinuxLibertine-Bold-Italic', os.path.join(dir, 'Optima-Thin.ttf')))
+    # Import fonts from indico.extra (separate package)
+    import indico.extra.fonts
+
+    dir=os.path.split(os.path.abspath(indico.extra.fonts.__file__))[0]
+    pdfmetrics.registerFont(TTFont('Times-Roman', os.path.join(dir,'LiberationSerif-Regular.ttf')))
+    pdfmetrics.registerFont(TTFont('Times-Bold', os.path.join(dir, 'LiberationSerif-Bold.ttf')))
+    pdfmetrics.registerFont(TTFont('Times-Italic', os.path.join(dir,'LiberationSerif-Italic.ttf')))
+    pdfmetrics.registerFont(TTFont('Times-Bold-Italic', os.path.join(dir, 'LiberationSerif-BoldItalic.ttf')))
+    pdfmetrics.registerFont(TTFont('Courier', os.path.join(dir, 'LiberationMono-Regular.ttf')))
+    pdfmetrics.registerFont(TTFont('Courier-Bold', os.path.join(dir, 'LiberationMono-Bold.ttf')))
+    pdfmetrics.registerFont(TTFont('Courier-Italic', os.path.join(dir, 'LiberationMono-Italic.ttf')))
+    pdfmetrics.registerFont(TTFont('Courier-Bold-Italic', os.path.join(dir, 'LiberationMono-BoldItalic.ttf')))
+    pdfmetrics.registerFont(TTFont('LinuxLibertine', os.path.join(dir, 'LinLibertine_Re-4.4.1.ttf')))
+    pdfmetrics.registerFont(TTFont('LinuxLibertine-Bold', os.path.join(dir, 'LinLibertine_Bd-4.1.0.ttf')))
+    pdfmetrics.registerFont(TTFont('LinuxLibertine-Italic', os.path.join(dir, 'LinLibertine_It-4.0.6.ttf')))
+    pdfmetrics.registerFont(TTFont('LinuxLibertine-Bold-Italic', os.path.join(dir, 'LinLibertine_BI-4.0.5.ttf')))
     pdfmetrics.registerFont(TTFont('Kochi-Mincho', os.path.join(dir, 'kochi-mincho-subst.ttf')))
     pdfmetrics.registerFont(TTFont('Kochi-Gothic', os.path.join(dir, 'kochi-gothic-subst.ttf')))

indico/MaKaC/PDFinterface/conference.py

@@ -2548 +2548 @@
     __fonts = {'Times New Roman':['Times-Roman','Times-Bold','Times-Italic','Times-Bold-Italic'],
                'Courier':['Courier', 'Courier-Bold', 'Courier-Italic', 'Courier-Bold-Italic'],
-               'OhMyGodStars':['OhMyGodStars','OhMyGodStars','OhMyGodStars','OhMyGodStars'],
-               'OptimaThin':['Optima-Thin','Optima-Thin','Optima-Thin','Optima-Thin'],
                'LinuxLibertine':['LinuxLibertine','LinuxLibertine-Bold','LinuxLibertine-Italic','LinuxLibertine-Bold-Italic'],
                'Kochi-Mincho':['Kochi-Mincho','Kochi-Mincho','Kochi-Mincho','Kochi-Mincho'],
@@ -2805 +2803 @@
     __fonts = {'Times New Roman':['Times-Roman','Times-Bold','Times-Italic','Times-Bold-Italic'],
                'Courier':['Courier', 'Courier-Bold', 'Courier-Italic', 'Courier-Bold-Italic'],
-               'OhMyGodStars':['OhMyGodStars','OhMyGodStars','OhMyGodStars','OhMyGodStars'],
-               'OptimaThin':['Optima-Thin','Optima-Thin','Optima-Thin','Optima-Thin'],
                'LinuxLibertine':['LinuxLibertine','LinuxLibertine-Bold','LinuxLibertine-Italic','LinuxLibertine-Bold-Italic'],
                'Kochi-Mincho':['Kochi-Mincho','Kochi-Mincho','Kochi-Mincho','Kochi-Mincho'],

indico/MaKaC/webinterface/tpls/ConfModifPosterDesign.tpl

@@ -816 +816 @@
               <option>Times New Roman</option>
               <option>Courier</option>
-              <option>OhMyGodStars</option>
-              <option>OptimaThin</option>
             </optgroup>  
             <optgroup label="Special Character Fonts">