-
Notifications
You must be signed in to change notification settings - Fork 2.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix regex in cloneBlock
function
#1269
Merged
troosan
merged 182 commits into
PHPOffice:develop
from
nicoder:improve-cloneBlock-regex
Jul 18, 2018
Merged
Fix regex in cloneBlock
function
#1269
troosan
merged 182 commits into
PHPOffice:develop
from
nicoder:improve-cloneBlock-regex
Jul 18, 2018
Conversation
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
added options 'showAxisLabels', 'showGridX', 'showGridY' to charts style element
removed whitespace changed inline if statement
Fix a typo (d-M-yyy H:mm), and expand the list of valid date formats.
Time formats should either be "h" or "HH". There were some formats which were incorrectly specified as "H".
…e width (only for word output)
Delete VERSION file since it's outdated so not usefull anymore
it wrongly matched `<w:pPr` when looking for `<w:p` in that case the cloned block would not be valid XML, and so the generated docx document could not be opened by Word adding the `\b` word boundary to the regex fixes this. the accompanying unit test failed with this message when trying to load the generated file: ``` ErrorException: DOMDocument::loadXML(): Opening and ending tag mismatch: p line 2 and body in Entity, line: 2 ``` This might solve issues such as PHPOffice#681 and PHPOffice#664.
fix typo in test method name
fix typo in CONTRIBUTING.md
Delete VERSION
Hi, If / when this is merged I would like to open an other pull request to teach By giving it the same |
…to various_html_parsing_fixes
Save PNG alpha information when using remote images.
* add changed information to HTML writer * add missing writeFontStyle * refactor track changes * set the style * update documentation and release note * Update the changelog and doc * fix scrutinizer issues
…ixes Various html parsing fixes, fixes for PHPOffice#1252 and PHPOffice#1254
write column width in ODT writer
* Require `ext-zip` for development * Require `ext-gd` for development
…loader disable entity loader before parsing XML to avoid XXE injection
* Added Support for Indentation & Tabs on RTF Writer. * add decimal tab writer + tests * Update CHANGELOG.md
Support reading of w:drawing for documents produced by word 2011+
allows decimal numbers in line-height style
Allow passing short lang code
[ci skip]
…/PHPWord into fix_clone_block
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
it wrongly matched
<w:pPr
when looking for<w:p
in that case the cloned block would not be valid XML,
and so the generated docx document could not be opened by Word.
adding the
\b
word boundary to the regex fixes this.the accompanying unit test failed with this message when trying to load
the generated file:
Fixes #681 and #664.