Merge branch 'fix_font_style_based_on' into develop

Author: troosan

src/PhpWord/Writer/Word2007/Part/Styles.php

@@ -182,7 +182,11 @@ private function writeFontStyle(XMLWriter $xmlWriter, $styleName, FontStyle $sty
 
         // Parent style
         if (!is_null($paragraphStyle)) {
-             $xmlWriter->writeElementBlock('w:basedOn', 'w:val', $paragraphStyle->getStyleName());
+            if ($paragraphStyle->getStyleName() != null) {
+                $xmlWriter->writeElementBlock('w:basedOn', 'w:val', $paragraphStyle->getStyleName());
+            } elseif ($paragraphStyle->getBasedOn() != null) {
+                $xmlWriter->writeElementBlock('w:basedOn', 'w:val', $paragraphStyle->getBasedOn());
+            }
         }
 
         // w:pPr

tests/PhpWord/Writer/Word2007/Part/StylesTest.php

@@ -114,4 +114,32 @@ public function testFontStyleBasedOn()
         $element = $doc->getElement($path, $file);
         $this->assertNull($element);
     }
+
+    function testFontStyleBasedOnOtherFontStyle() {
+        $phpWord = new PhpWord();
+
+        $styleGenerationP = new Paragraph();
+        $styleGenerationP->setAlignment(Jc::BOTH);
+
+        $styleGeneration = new Font();
+        $styleGeneration->setParagraph($styleGenerationP);
+        $styleGeneration->setSize(9.5);
+        $phpWord->addFontStyle('Generation', $styleGeneration);
+
+        $styleGenerationEteinteP = new Paragraph();
+        $styleGenerationEteinteP->setBasedOn('Generation');
+
+        $styleGenerationEteinte = new Font();
+        $styleGenerationEteinte->setParagraph($styleGenerationEteinteP);
+        $styleGenerationEteinte->setSize(8.5);
+        $phpWord->addFontStyle('GeneratEteinte', $styleGenerationEteinte);
+        
+        $doc = TestHelperDOCX::getDocument($phpWord);
+
+        $file = 'word/styles.xml';
+
+        $path = '/w:styles/w:style[@w:styleId="GeneratEteinte"]/w:basedOn';
+        $element = $doc->getElement($path, $file);
+        $this->assertEquals('Generation', $element->getAttribute('w:val'));
+    }
 }