Fix ODT exporting tables #274
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -646,7 +646,7 @@ function renderODTOpenTable ($renderer, $attr, $style, $attr_string) { | |
|
|
||
| if ( empty($css_properties ['float']) === true ) { | ||
| // If the float property is not set, set it to 'left' becuase the ODT plugin | ||
| // would default to 'center' which is different to the XHTML behaviour. | ||
| //$css_properties ['float'] = 'left'; | ||
| if (strpos ($class, 'wrap_left') !== false ) { | ||
| $css_properties ['float'] = 'left'; | ||
|
|
@@ -668,10 +668,10 @@ function renderODTOpenTable ($renderer, $attr, $style, $attr_string) { | |
|
|
||
| $background_color = $css_properties ['background-color']; | ||
| $image = $css_properties ['background-image'] ?? null; | ||
| $margin_top = $css_properties ['margin-top'] ?? '0cm'; | ||
| $margin_right = $css_properties ['margin-right'] ?? '0cm'; | ||
| $margin_bottom = $css_properties ['margin-bottom'] ?? '0cm'; | ||
| $margin_left = $css_properties ['margin-left'] ?? '0cm'; | ||
| $width = $attr ['width']; | ||
|
|
||
| // Open 2x1 table if image is present | ||
|
|
@@ -692,7 +692,7 @@ function renderODTOpenTable ($renderer, $attr, $style, $attr_string) { | |
| } | ||
| $frame_props ['min-height'] = '1cm'; | ||
| $frame_props ['width'] = $attr ['width']; | ||
| $frame_props ['float'] = $css_properties ['float'] ?? null; | ||
|
There was a problem hiding this comment.
There was a problem hiding this comment. It isn't a CSS property, it's for PHP control only. On line https://github.com/selfthinker/dokuwiki_plugin_wrap/blob/master/helper.php#L709 PHP just checks if this value is null to proper set the margin and padding values to '0cm'. |
||
| if ( self::$table_entr > 1 ) { | ||
| $frame_props ['anchor-type'] = 'as-char'; | ||
| } else { | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
0 does not really need a unit. So '0' instead of '0cm' would be fine (and shorter).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not sure, because it isn't exactly CSS, it uses ODT that uses a XML like syntax. If you do not specify the unit the ODT rendering on LibreOffice may fail.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah, ok. I didn't realise that. I have no experience with ODT so I'll shut up now ;-)