set font name, fixes #6

MetadataConsulting · Oct 15, 2015 · 3abfdef · 3abfdef
1 parent 79a7c1b
commit 3abfdef
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -12,7 +12,7 @@ plugins {
     id 'org.asciidoctor.gradle.asciidoctor' version '1.5.1'
 }
 
-String currentVersion = '0.1.9'
+String currentVersion = '0.1.10'
 
 version = currentVersion
 

diff --git a/docs/images/fonts.png b/docs/images/fonts.png
diff --git a/docs/index.adoc b/docs/index.adoc
@@ -590,7 +590,7 @@ image:borders.png[]
 
 === Fonts
 
-You can customize the font size and color of the text in the cell. You also can make it `bold`, `italic`, `underline` or
+You can customize the font size, name and color of the text in the cell. You also can make it `bold`, `italic`, `underline` or
 `strikeout`. See <<Available predefined colors>>.
 
 [source,groovy]
@@ -609,10 +609,11 @@ row {
     }
     cell {
         width auto
-        value 'Underline'
+        value 'Underline Courier New'
         style {
             font {
                 underline
+                name 'Courier New'
             }
         }
     }

diff --git a/spreadsheet-builder-api/src/main/java/org/modelcatalogue/builder/spreadsheet/api/Font.java b/spreadsheet-builder-api/src/main/java/org/modelcatalogue/builder/spreadsheet/api/Font.java
@@ -6,6 +6,7 @@ public interface Font extends ProvidesHTMLColors {
     void color(Color color);
 
     void size(int size);
+    void name(String name);
 
     Object getItalic();
     Object getBold();

diff --git a/...eet-builder-poi/src/main/groovy/org/modelcatalogue/builder/spreadsheet/poi/PoiFont.groovy b/...eet-builder-poi/src/main/groovy/org/modelcatalogue/builder/spreadsheet/poi/PoiFont.groovy
@@ -36,6 +36,11 @@ class PoiFont extends AbstractHTMLColorProvider implements Font {
         font.setFontHeightInPoints(size.shortValue())
     }
 
+    @Override
+    void name(String name) {
+        font.setFontName(name)
+    }
+
     @Override
     Object getItalic() {
         font.italic = true

diff --git a/...poi/src/test/groovy/org/modelcatalogue/builder/spreadsheet/poi/PoiExcelBuilderSpec.groovy b/...poi/src/test/groovy/org/modelcatalogue/builder/spreadsheet/poi/PoiExcelBuilderSpec.groovy
@@ -46,6 +46,50 @@ class PoiExcelBuilderSpec extends Specification {
                     }
                 }
 
+                sheet('Fonts') {
+                    row {
+                        cell {
+                            width auto
+                            value 'Bold Red 22'
+                            style {
+                                font {
+                                    bold
+                                    color red
+                                    size 22
+                                }
+                            }
+                        }
+                        cell {
+                            width auto
+                            value 'Underline Courier New'
+                            style {
+                                font {
+                                    underline
+                                    name 'Courier New'
+                                }
+                            }
+                        }
+                        cell {
+                            width auto
+                            value 'Italic'
+                            style {
+                                font {
+                                    italic
+                                }
+                            }
+                        }
+                        cell {
+                            width auto
+                            value 'Strikeout'
+                            style {
+                                font {
+                                    strikeout
+                                }
+                            }
+                        }
+                    }
+                }
+
                 sheet('Rich Text') {
                     row {
                         cell {
@@ -54,6 +98,7 @@ class PoiExcelBuilderSpec extends Specification {
                             text 'Red', {
                                 color red
                                 size 22
+                                name "Times New Roman"
                             }
                             text ' '
                             text 'Riding', {
@@ -123,7 +168,7 @@ class PoiExcelBuilderSpec extends Specification {
                     }
                 }
 
-                sheet('Cell Adressing') {
+                sheet('Cell Addressing') {
                     row(2) {
                         style {
                             background whiteSmoke