Skip to content

Commit

Permalink
[WIP] Cleanup, add copy styles.xml
Browse files Browse the repository at this point in the history
  • Loading branch information
@artnum
artnum committed Nov 4, 2024
1 parent a836908 commit ef6fdb7
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 29 deletions.
61 changes: 35 additions & 26 deletions src/Output/OOXML.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@

namespace md2ooxml\Output;

use Exception;
use md2ooxml\TagType;
use PhpOffice\PhpWord\Element\Section;
use PhpOffice\PhpWord\Element\TextRun;
use PhpOffice\PhpWord\PhpWord;
use PhpOffice\PhpWord\Style\ListItem;
use phpseclib3\Math\BigInteger\Engines\PHP;
use ZipArchive;

class OOXML {
public Section $section;
public PhpWord $word;
function __construct(PhpWord $word, ?Section $section = null)
{

$this->word = $word;
if ($section === null) {
$section = $word->addSection('md-section');
Expand All @@ -24,10 +24,33 @@ function __construct(PhpWord $word, ?Section $section = null)
}
}

/* Copy styles.xml as phpword doesn't copy correctly all styles. */
function copyStyles (string $template, string $output)
{
try {
$srcZip = new ZipArchive;
$destZip = new ZipArchive;
if (!$srcZip->open($template, ZipArchive::RDONLY)) {
throw new Exception('Zip open failed');
}
if (!$destZip->open($output)) {
throw new Exception('Zip open failed');
}
$destZip->addFromString('word/styles.xml', $srcZip->getFromName('word/styles.xml'));

$srcZip->close();
$destZip->close();
} catch (Exception $e) {
throw new Exception('Failed to copy styles.xml', 0, $e);
}
}

/* escape chars */
function write(TextRun $run, string $text, string $fontStyle = 'md-text') {
$run->addText(htmlspecialchars($text), $fontStyle);
}

/* convert cm to twip */
function cm2twip (float $cm) {
return round($cm * 1000 / 17.64, 0, PHP_ROUND_HALF_EVEN) * 10;
}
Expand All @@ -49,10 +72,13 @@ function output(array $elements) {
$run = null;
$currentTable = null;
$fontStyle = 'md-text';
$listPStyle = 'md-list-ul';
$listStyle = 'md-ol-numberging';

/* numbering style are not copied from template */
/* *** numbering style are not copied from template *** */

/* numbered list set as default in phpword don't seem to work, recreate
* here
*/
$baseNumberingStyle = [
'type' => 'multilevel',
'levels' => [
Expand All @@ -67,25 +93,7 @@ function output(array $elements) {
['format' => 'lowerRoman', 'text' => '%9. ', 'left' => self::DEFAULT_LEFT_L9_TWIP, 'hanging' => self::DEFAULT_HANGING_TWIP],

],
];
/*
$this->word->addNumberingStyle(
'md-ol-item',
[
'type' => 'multilevel',
'levels' => [
['format' => 'bullet', 'text' => '•', 'left' => self::DEFAULT_LEFT_L1_TWIP, 'hanging' => self::DEFAULT_HANGING_TWIP],
['format' => 'bullet', 'text' => 'o', 'left' => self::DEFAULT_LEFT_L2_TWIP, 'hanging' => self::DEFAULT_HANGING_TWIP],
['format' => 'bullet', 'text' => '🞍', 'left' => self::DEFAULT_LEFT_L3_TWIP, 'hanging' => self::DEFAULT_HANGING_TWIP],
['format' => 'bullet', 'text' => '•', 'left' => self::DEFAULT_LEFT_L4_TWIP, 'hanging' => self::DEFAULT_HANGING_TWIP],
['format' => 'bullet', 'text' => 'o', 'left' => self::DEFAULT_LEFT_L5_TWIP, 'hanging' => self::DEFAULT_HANGING_TWIP],
['format' => 'bullet', 'text' => '🞍', 'left' => self::DEFAULT_LEFT_L6_TWIP, 'hanging' => self::DEFAULT_HANGING_TWIP],
['format' => 'bullet', 'text' => '•', 'left' => self::DEFAULT_LEFT_L7_TWIP, 'hanging' => self::DEFAULT_HANGING_TWIP],
['format' => 'bullet', 'text' => 'o', 'left' => self::DEFAULT_LEFT_L8_TWIP, 'hanging' => self::DEFAULT_HANGING_TWIP],
['format' => 'bullet', 'text' => '🞍', 'left' => self::DEFAULT_LEFT_L9_TWIP, 'hanging' => self::DEFAULT_HANGING_TWIP]
]
]
); */
];

$listOLIdCount = 0;
$pStyle = 'md-ol-item';
Expand Down Expand Up @@ -159,6 +167,7 @@ function output(array $elements) {
$run = null;
break;
}
/* hack to have numbering restart */
$listStyle = 'md-ol-item' . $listOLIdCount++;
$this->word->addNumberingStyle(
$listStyle,
Expand Down Expand Up @@ -207,12 +216,13 @@ function output(array $elements) {
break;
case TagType::TABLE:
if ($element->close) { break; }
$currentTable = $this->section->addTable();
$currentTable = $this->section->addTable('md-table');
break;
case TagType::TABLEHEADER:
case TagType::TABLEROW:
if ($currentTable === null) { break; }
if ($element->close) { break; }

$currentTable->addRow();
break;
case TagType::TABLECELL:
Expand All @@ -226,8 +236,7 @@ function output(array $elements) {
}
$currentTable->addCell()->addText($text);
$i = $i + $j;
break;

break;
}
}
}
Expand Down
3 changes: 0 additions & 3 deletions src/parse.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,6 @@ function is_previous_tablerow_delimiter_row (array $elements, int $index): int {

function isEmptyValue($value)
{
echo "VALUE <" . $value . '> : ' . preg_match('/^[ \s\t\n\r\n]*$/', $value) . PHP_EOL;
if (preg_match('/^[ \s\t\n\r\n]*$/', $value)) {
return true;
}
Expand Down Expand Up @@ -778,7 +777,6 @@ function parse(array $tokens): array
!is_tag_open($opened, TagType::STRIKETHROUGH)
&& peek_next_token_type($tokens, $i) !== Token::WS
) {
echo 'OPEN STRIKETHROUGH' . PHP_EOL;
$result[] = new MDElement(TagType::STRIKETHROUGH);
set_tag_open($opened, TagType::STRIKETHROUGH);
continue;
Expand All @@ -787,7 +785,6 @@ function parse(array $tokens): array
is_tag_open($opened, TagType::STRIKETHROUGH)
&& peek_previous_token_type($tokens, $i) !== Token::WS
) {
echo 'CLOSE STRIKETHROUGH' . PHP_EOL;
$result[] = new MDElement(TagType::STRIKETHROUGH, 0, true);
unset_all_tags_open($opened, TagType::STRIKETHROUGH);
continue;
Expand Down

0 comments on commit ef6fdb7

Please sign in to comment.