Skip to content
Permalink
Browse files

Merge branch 't/16826' into major

  • Loading branch information...
Tade0 committed Jan 27, 2017
2 parents a7d8e4d + 61dcf73 commit b99fcc27fe8fdbd465da4d0acb464a4ac18eacba
Showing with 8,210 additions and 1,216 deletions.
  1. +1 −0 CHANGES.md
  2. +19 −0 plugins/pastefromword/filter/default.js
  3. +77 −1 tests/plugins/pastefromword/generated/_fixtures/Ordered_list_multiple/word2013/expected_ie11.html
  4. +159 −1 .../plugins/pastefromword/generated/_fixtures/Ordered_list_multiple_edgy/word2013/expected_ie11.html
  5. +103 −1 ...s/plugins/pastefromword/generated/_fixtures/Tickets/10784line_missing/word2013/expected_ie11.html
  6. +83 −26 tests/plugins/pastefromword/generated/_fixtures/Tickets/10784line_missing/word2013/ie11.html
  7. +41 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/11376bullets_v1/word2013/expected_ie11.html
  8. +29 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/12385number_list/word2013/expected_ie11.html
  9. +2,284 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/12406Doc1/word2013/expected_ie11.html
  10. +340 −1 ...s/pastefromword/generated/_fixtures/Tickets/12821ELL_Forum_Invitation/word2013/expected_ie11.html
  11. +18 −1 ...ns/pastefromword/generated/_fixtures/Tickets/13590ckeditor-numberlist/word2013/expected_ie11.html
  12. +58 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/13616/word2013/expected_ie11.html
  13. +68 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/1457list-test/word2013/expected_ie11.html
  14. BIN tests/plugins/pastefromword/generated/_fixtures/Tickets/16826OrderedList/OrderedList.docx
  15. +45 −0 tests/plugins/pastefromword/generated/_fixtures/Tickets/16826OrderedList/expected.html
  16. +74 −0 tests/plugins/pastefromword/generated/_fixtures/Tickets/16826OrderedList/word2007/chrome.html
  17. +74 −0 tests/plugins/pastefromword/generated/_fixtures/Tickets/16826OrderedList/word2007/expected_ie11.html
  18. +73 −0 tests/plugins/pastefromword/generated/_fixtures/Tickets/16826OrderedList/word2007/ie11.html
  19. +61 −0 tests/plugins/pastefromword/generated/_fixtures/Tickets/16826OrderedList/word2013/chrome.html
  20. +129 −0 tests/plugins/pastefromword/generated/_fixtures/Tickets/16826OrderedList/word2013/edge.html
  21. +75 −0 tests/plugins/pastefromword/generated/_fixtures/Tickets/16826OrderedList/word2013/expected_ie11.html
  22. +28 −0 tests/plugins/pastefromword/generated/_fixtures/Tickets/16826OrderedList/word2013/expected_ie8.html
  23. +59 −0 tests/plugins/pastefromword/generated/_fixtures/Tickets/16826OrderedList/word2013/firefox.html
  24. +49 −0 tests/plugins/pastefromword/generated/_fixtures/Tickets/16826OrderedList/word2013/ie11.html
  25. +149 −0 tests/plugins/pastefromword/generated/_fixtures/Tickets/16826OrderedList/word2013/ie8.html
  26. +380 −1 ...s/plugins/pastefromword/generated/_fixtures/Tickets/1707bug_fckeditor/word2013/expected_ie11.html
  27. +66 −103 ...gins/pastefromword/generated/_fixtures/Tickets/3039blog_test_2003_(2)/word2013/expected_ie11.html
  28. +176 −1 .../pastefromword/generated/_fixtures/Tickets/5399This_is_a_line_of_text/word2013/expected_ie11.html
  29. +117 −1 ...plugins/pastefromword/generated/_fixtures/Tickets/6241Sample_word_doc/word2013/expected_ie11.html
  30. +25 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/6286Sample_6286/word2013/expected_ie11.html
  31. +152 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/6330bullets/word2013/expected_ie11.html
  32. +28 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/6493Questions_and_answers/expected.html
  33. +79 −1 ...s/pastefromword/generated/_fixtures/Tickets/6493Questions_and_answers/word2013/expected_ie11.html
  34. +40 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/6533test_doc/word2013/expected_ie11.html
  35. +77 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/6570ordered_list/word2013/expected_ie11.html
  36. +77 −1 ...plugins/pastefromword/generated/_fixtures/Tickets/6570ordered_list_97/word2013/expected_ie11.html
  37. +90 −1 ...fromword/generated/_fixtures/Tickets/6639nested_list_with_empty_lines/word2013/expected_ie11.html
  38. +31 −1 ...ed/_fixtures/Tickets/6658CKEditor_Word_tabs_between_list_items_Sample/word2013/expected_ie11.html
  39. +132 −201 tests/plugins/pastefromword/generated/_fixtures/Tickets/6662/word2013/expected_ie11.html
  40. +96 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/6662bullets/word2013/expected_ie11.html
  41. +117 −1 .../pastefromword/generated/_fixtures/Tickets/6956CKEditor_pasting_issue/word2013/expected_ie11.html
  42. +117 −1 .../pastefromword/generated/_fixtures/Tickets/6973CKEditor_pasting_issue/word2013/expected_ie11.html
  43. +39 −60 tests/plugins/pastefromword/generated/_fixtures/Tickets/7131TC_7131_2/word2013/expected_ie11.html
  44. +40 −76 tests/plugins/pastefromword/generated/_fixtures/Tickets/7209test2/word2013/expected_ie11.html
  45. +132 −200 tests/plugins/pastefromword/generated/_fixtures/Tickets/7581fancyList/word2013/expected_ie11.html
  46. +43 −1 ...d/generated/_fixtures/Tickets/7584Numbered_list_with_diff_start_value/word2013/expected_ie11.html
  47. +80 −1 .../_fixtures/Tickets/7593Numbere_&_Bullet_list_with_list_styles_applied/word2013/expected_ie11.html
  48. +316 −1 ...astefromword/generated/_fixtures/Tickets/7620AlphabeticNumberingLists/word2013/expected_ie11.html
  49. +51 −89 tests/plugins/pastefromword/generated/_fixtures/Tickets/7872lists/word2013/expected_ie11.html
  50. +187 −274 tests/plugins/pastefromword/generated/_fixtures/Tickets/7918Numbering/word2013/expected_ie11.html
  51. +117 −1 ...plugins/pastefromword/generated/_fixtures/Tickets/7950Sample_word_doc/word2013/expected_ie11.html
  52. +52 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/8734list_test/word2013/expected_ie11.html
  53. +92 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/8734list_test2/word2013/expected_ie11.html
  54. +113 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/9144test/word2013/expected_ie11.html
  55. +59 −89 ...astefromword/generated/_fixtures/Tickets/9274CKEditor_formating_issue/word2013/expected_ie11.html
  56. +83 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/9331ckBugWord1/word2013/expected_ie11.html
  57. +126 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/9456Stuff_to_get/word2013/expected_ie11.html
  58. +91 −1 ...romword/generated/_fixtures/Tickets/9456text-with-bullet-list-example/word2013/expected_ie11.html
  59. +287 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/9475List2010/word2013/expected_ie11.html
  60. +221 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/9475list2003/word2013/expected_ie11.html
  61. +73 −1 tests/plugins/pastefromword/generated/_fixtures/Unordered_list/word2013/expected_ie11.html
  62. +39 −60 tests/plugins/pastefromword/generated/_fixtures/Unordered_list_multiple/word2013/expected_ie11.html
  63. +50 −0 tests/plugins/pastefromword/generated/tickets_strict.js
  64. +12 −0 tests/tickets/16826/ielists.html
  65. +11 −0 tests/tickets/16826/ielists.md
@@ -21,6 +21,7 @@ New Features:

Fixed Issues:

* [#16826](http://dev.ckeditor.com/ticket/16826): Fixed: Superfluous paragraphs within lists [pasted from Word](http://ckeditor.com/addon/pastefromword) in IE.
* [#16818](http://dev.ckeditor.com/ticket/16818): Fixed: Table cell height not parsed properly by the [Paste from Word](http://ckeditor.com/addon/pastefromword) plugin.
* [#13446](http://dev.ckeditor.com/ticket/13446): [Chrome] Fixed: It is possible to type in an unfocused inline editor.
* [#14856](http://dev.ckeditor.com/ticket/14856): Fixed: [Font size and font family](http://ckeditor.com/addon/font) reset each other when modified at certain positions.
@@ -114,6 +114,25 @@

if ( List.thisIsAListItem( editor, element ) ) {
List.convertToFakeListItem( editor, element );

// IE pastes nested paragraphs in list items, which is different from other browsers. (#16826)
// There's a possibility that list item will contain multiple paragraphs, in that case we want
// to split them with BR.
tools.array.reduce( element.children, function( paragraphsReplaced, node ) {
if ( node.name === 'p' ) {
// If there were already paragraphs replaced, put a br before this paragraph, so that
// it's inline children are displayed in a next line.
if ( paragraphsReplaced > 0 ) {
var br = new CKEDITOR.htmlParser.element( 'br' );
br.insertBefore( node );
}

node.replaceWithChildren();
paragraphsReplaced += 1;
}

return paragraphsReplaced;
}, 0 );
} else {
// In IE list level information is stored in <p> elements inside <li> elements.
var container = element.getAscendant( function( element ) {
@@ -1 +1,77 @@
<ol><li><p><span style="font-style:normal"><span style="font-weight:normal">this</span></span></p></li><li><p><span style="font-size:11pt"><span style="color:rgb(0, 0, 0)"><span style="font-family:&quot;calibri&quot;,sans-serif"><span style="font-style:normal"><span style="font-weight:normal">is</span></span></span></span></span></p></li><li><p><span style="font-size:11pt"><span style="color:rgb(0, 0, 0)"><span style="font-family:&quot;calibri&quot;,sans-serif"><span style="font-style:normal"><span style="font-weight:normal">a</span></span></span></span></span></p><ol style="list-style-type:lower-alpha"><li><p><span style="font-size:11pt"><span style="color:rgb(0, 0, 0)"><span style="font-family:&quot;calibri&quot;,sans-serif"><span style="font-style:normal"><span style="font-weight:normal">multi</span></span></span></span></span></p><ol style="list-style-type:lower-roman"><li><p><span style="font-size:11pt"><span style="color:rgb(0, 0, 0)"><span style="font-family:&quot;calibri&quot;,sans-serif"><span style="font-style:normal"><span style="font-weight:normal">level</span></span></span></span></span></p></li></ol></li><li><p><span style="font-size:11pt"><span style="color:rgb(0, 0, 0)"><span style="font-family:&quot;calibri&quot;,sans-serif"><span style="font-style:normal"><span style="font-weight:normal">ordered</span></span></span></span></span></p></li></ol></li><li><p><span style="font-size:11pt"><span style="color:rgb(0, 0, 0)"><span style="font-family:&quot;calibri&quot;,sans-serif"><span style="font-style:normal"><span style="font-weight:normal">list</span></span></span></span></span></p></li></ol>
<ol>
<li>
<span style="font-style:normal">
<span style="font-weight:normal">this</span>
</span>
</li>
<li>
<span style="font-size:11pt">
<span style="color:rgb(0, 0, 0)">
<span style="font-family:&quot;calibri&quot;,sans-serif">
<span style="font-style:normal">
<span style="font-weight:normal">is</span>
</span>
</span>
</span>
</span>
</li>
<li>
<span style="font-size:11pt">
<span style="color:rgb(0, 0, 0)">
<span style="font-family:&quot;calibri&quot;,sans-serif">
<span style="font-style:normal">
<span style="font-weight:normal">a</span>
</span>
</span>
</span>
</span>
<ol style="list-style-type:lower-alpha">
<li>
<span style="font-size:11pt">
<span style="color:rgb(0, 0, 0)">
<span style="font-family:&quot;calibri&quot;,sans-serif">
<span style="font-style:normal">
<span style="font-weight:normal">multi</span>
</span>
</span>
</span>
</span>
<ol style="list-style-type:lower-roman">
<li>
<span style="font-size:11pt">
<span style="color:rgb(0, 0, 0)">
<span style="font-family:&quot;calibri&quot;,sans-serif">
<span style="font-style:normal">
<span style="font-weight:normal">level</span>
</span>
</span>
</span>
</span>
</li>
</ol>
</li>
<li>
<span style="font-size:11pt">
<span style="color:rgb(0, 0, 0)">
<span style="font-family:&quot;calibri&quot;,sans-serif">
<span style="font-style:normal">
<span style="font-weight:normal">ordered</span>
</span>
</span>
</span>
</span>
</li>
</ol>
</li>
<li>
<span style="font-size:11pt">
<span style="color:rgb(0, 0, 0)">
<span style="font-family:&quot;calibri&quot;,sans-serif">
<span style="font-style:normal">
<span style="font-weight:normal">list</span>
</span>
</span>
</span>
</span>
</li>
</ol>
@@ -1 +1,159 @@
<p style="margin-left:0in; margin-right:0in"><span style="color:#000000"><span style="font-family:calibri"><span style="font-size:medium">notice, how in the second list the first level 2 element starts with a “b.”, instead of an “a.”. the level 3 list (“i. level, ii. here”) is an implicit list item.</span></span></span></p><ol><li><p><span style="font-style:normal"><span style="font-weight:normal">the</span></span></p><ol style="list-style-type:lower-alpha"><li><p><span style="font-size:11pt"><span style="color:rgb(0, 0, 0)"><span style="font-family:&quot;calibri&quot;,sans-serif"><span style="font-style:normal"><span style="font-weight:normal">levels</span></span></span></span></span></p><ol style="list-style-type:lower-roman"><li><p><span style="font-size:11pt"><span style="color:rgb(0, 0, 0)"><span style="font-family:&quot;calibri&quot;,sans-serif"><span style="font-style:normal"><span style="font-weight:normal">go</span></span></span></span></span></p></li><li><p><span style="font-size:11pt"><span style="color:rgb(0, 0, 0)"><span style="font-family:&quot;calibri&quot;,sans-serif"><span style="font-style:normal"><span style="font-weight:normal">one</span></span></span></span></span></p></li><li><p><span style="font-size:11pt"><span style="color:rgb(0, 0, 0)"><span style="font-family:&quot;calibri&quot;,sans-serif"><span style="font-style:normal"><span style="font-weight:normal">up</span></span></span></span></span></p></li><li><p><span style="font-size:11pt"><span style="color:rgb(0, 0, 0)"><span style="font-family:&quot;calibri&quot;,sans-serif"><span style="font-style:normal"><span style="font-weight:normal">at</span></span></span></span></span></p></li></ol></li><li><p><span style="font-size:11pt"><span style="color:rgb(0, 0, 0)"><span style="font-family:&quot;calibri&quot;,sans-serif"><span style="font-style:normal"><span style="font-weight:normal">a</span></span></span></span></span></p></li></ol></li><li><p><span style="font-size:11pt"><span style="color:rgb(0, 0, 0)"><span style="font-family:&quot;calibri&quot;,sans-serif"><span style="font-style:normal"><span style="font-weight:normal">time</span></span></span></span></span></p></li></ol><p style="margin-left:0.25in; margin-right:0in"><br /></p><ol><li><p><span style="font-style:normal"><span style="font-weight:normal">one</span></span></p><ol style="list-style-type:lower-alpha"><li style="list-style-type:none"><ol style="list-style-type:lower-roman"><li><p><span style="font-size:11pt"><span style="color:rgb(0, 0, 0)"><span style="font-family:&quot;calibri&quot;,sans-serif"><span style="font-style:normal"><span style="font-weight:normal">level</span></span></span></span></span></p></li><li><p><span style="font-size:11pt"><span style="color:rgb(0, 0, 0)"><span style="font-family:&quot;calibri&quot;,sans-serif"><span style="font-style:normal"><span style="font-weight:normal">here</span></span></span></span></span></p></li></ol></li><li><p><span style="font-size:11pt"><span style="color:rgb(0, 0, 0)"><span style="font-family:&quot;calibri&quot;,sans-serif"><span style="font-style:normal"><span style="font-weight:normal">is</span></span></span></span></span></p></li></ol></li><li><p><span style="font-size:11pt"><span style="color:rgb(0, 0, 0)"><span style="font-family:&quot;calibri&quot;,sans-serif"><span style="font-style:normal"><span style="font-weight:normal">skipped</span></span></span></span></span></p></li></ol><p style="margin-left:0.25in; margin-right:0in"><br /></p>
<p style="margin-left:0in; margin-right:0in">
<span style="color:#000000">
<span style="font-family:calibri">
<span style="font-size:medium">notice, how in the second list the first level 2 element starts with a “b.”, instead of an “a.”. the level 3 list (“i.
level, ii. here”) is an implicit list item.</span>
</span>
</span>
</p>
<ol>
<li>
<span style="font-style:normal">
<span style="font-weight:normal">the</span>
</span>
<ol style="list-style-type:lower-alpha">
<li>
<span style="font-size:11pt">
<span style="color:rgb(0, 0, 0)">
<span style="font-family:&quot;calibri&quot;,sans-serif">
<span style="font-style:normal">
<span style="font-weight:normal">levels</span>
</span>
</span>
</span>
</span>
<ol style="list-style-type:lower-roman">
<li>
<span style="font-size:11pt">
<span style="color:rgb(0, 0, 0)">
<span style="font-family:&quot;calibri&quot;,sans-serif">
<span style="font-style:normal">
<span style="font-weight:normal">go</span>
</span>
</span>
</span>
</span>
</li>
<li>
<span style="font-size:11pt">
<span style="color:rgb(0, 0, 0)">
<span style="font-family:&quot;calibri&quot;,sans-serif">
<span style="font-style:normal">
<span style="font-weight:normal">one</span>
</span>
</span>
</span>
</span>
</li>
<li>
<span style="font-size:11pt">
<span style="color:rgb(0, 0, 0)">
<span style="font-family:&quot;calibri&quot;,sans-serif">
<span style="font-style:normal">
<span style="font-weight:normal">up</span>
</span>
</span>
</span>
</span>
</li>
<li>
<span style="font-size:11pt">
<span style="color:rgb(0, 0, 0)">
<span style="font-family:&quot;calibri&quot;,sans-serif">
<span style="font-style:normal">
<span style="font-weight:normal">at</span>
</span>
</span>
</span>
</span>
</li>
</ol>
</li>
<li>
<span style="font-size:11pt">
<span style="color:rgb(0, 0, 0)">
<span style="font-family:&quot;calibri&quot;,sans-serif">
<span style="font-style:normal">
<span style="font-weight:normal">a</span>
</span>
</span>
</span>
</span>
</li>
</ol>
</li>
<li>
<span style="font-size:11pt">
<span style="color:rgb(0, 0, 0)">
<span style="font-family:&quot;calibri&quot;,sans-serif">
<span style="font-style:normal">
<span style="font-weight:normal">time</span>
</span>
</span>
</span>
</span>
</li>
</ol>
<p style="margin-left:0.25in; margin-right:0in">
<br />
</p>
<ol>
<li>
<span style="font-style:normal">
<span style="font-weight:normal">one</span>
</span>
<ol style="list-style-type:lower-alpha">
<li style="list-style-type:none">
<ol style="list-style-type:lower-roman">
<li>
<span style="font-size:11pt">
<span style="color:rgb(0, 0, 0)">
<span style="font-family:&quot;calibri&quot;,sans-serif">
<span style="font-style:normal">
<span style="font-weight:normal">level</span>
</span>
</span>
</span>
</span>
</li>
<li>
<span style="font-size:11pt">
<span style="color:rgb(0, 0, 0)">
<span style="font-family:&quot;calibri&quot;,sans-serif">
<span style="font-style:normal">
<span style="font-weight:normal">here</span>
</span>
</span>
</span>
</span>
</li>
</ol>
</li>
<li>
<span style="font-size:11pt">
<span style="color:rgb(0, 0, 0)">
<span style="font-family:&quot;calibri&quot;,sans-serif">
<span style="font-style:normal">
<span style="font-weight:normal">is</span>
</span>
</span>
</span>
</span>
</li>
</ol>
</li>
<li>
<span style="font-size:11pt">
<span style="color:rgb(0, 0, 0)">
<span style="font-family:&quot;calibri&quot;,sans-serif">
<span style="font-style:normal">
<span style="font-weight:normal">skipped</span>
</span>
</span>
</span>
</span>
</li>
</ol>
<p style="margin-left:0.25in; margin-right:0in">
<br />
</p>
@@ -1 +1,103 @@
<p style="margin-left:0in; margin-right:0in; text-align:left"><strong><u><span style="font-family:simsun"><span style="color:#000000"><span style="font-size:medium">销售情况</span></span></span></u></strong></p><p style="margin-left:0in; margin-right:0in"><span style="font-family:simsun"><span style="font-size:medium"><span style="color:#000000">ad发顺丰发顺丰发顺丰发顺丰发顺丰发顺丰发顺丰发顺丰发顺丰发顺丰发顺丰</span></span></span></p><ol><li><p><span style="font-weight:normal"><span style="tab-stops:list 21.0pt"><span style="font-family:simsun">发顺丰发顺丰发顺丰发顺丰发顺丰发顺丰发顺丰发顺丰发顺丰,</span></span></span></p></li><li><p><span style="font-size:12pt"><span style="color:rgb(0, 0, 0)"><span style="font-family:simsun"><span style="font-weight:normal"><span style="tab-stops:list 21.0pt"><span style="font-family:simsun">发顺丰发顺丰发顺丰发顺丰发顺丰发顺</span></span></span></span></span></span></p></li><li><p><span style="font-size:12pt"><span style="color:rgb(0, 0, 0)"><span style="font-family:simsun"><span style="font-weight:normal"><span style="tab-stops:list 21.0pt"><span style="font-family:simsun">发顺丰发顺丰发顺丰发顺丰发顺丰发顺还没立项。</span></span></span></span></span></span></p><p><br /></p><p><span style="font-size:12pt"><span style="color:rgb(0, 0, 0)"><span style="font-family:simsun"><span style="font-weight:normal"><span style="font-family:simsun">销售预计:</span></span></span></span></span></p><p><span style="font-size:12pt"><span style="color:rgb(0, 0, 0)"><span style="font-family:simsun"><span style="font-weight:normal"><span style="font-family:simsun">今年年底有</span><span style="font-family:simsun">600万-700万的销售</span></span></span></span></span></p><p><span style="font-size:12pt"><span style="color:rgb(0, 0, 0)"><span style="font-family:simsun"><span style="font-weight:normal"><span style="font-family:simsun">2的发生地方地方撒地方地方阿飞为1发生地方万的地方 地方撒地 地方第三方润。</span></span></span></span></span></p><p><br /></p><p><span style="font-size:12pt"><span style="color:rgb(0, 0, 0)"><span style="font-family:simsun"><span style="font-weight:normal"><span style="font-family:simsun">打算:一般俄文</span><span style="font-family:simsun">60%、10%(10%额放入的第一笔付为账,第二俄文%的款项看工程的长短,根据工程斯蒂芬30%、3额未遂犯项目工程为地方撒地方sad是否的萨芬撒佛挡杀佛第三方年。</span></span></span></span></span></p></li></ol><p style="margin-left:0in; margin-right:0in"><br /></p>
<p style="margin-left:0in; margin-right:0in; text-align:left">
<strong>
<u>
<span style="font-family:simsun">
<span style="color:#000000">
<span style="font-size:medium">销售情况</span>
</span>
</span>
</u>
</strong>
</p>
<p style="margin-left:0in; margin-right:0in">
<span style="font-family:simsun">
<span style="font-size:medium">
<span style="color:#000000">
ad 发顺丰发顺丰发顺丰发顺丰发顺丰发顺丰发顺丰发顺丰发顺丰发顺丰发顺丰
</span>
</span>
</span>
</p>
<ol>
<li>
<span style="font-weight:normal">
<span style="tab-stops:list 21.0pt">
<span style="font-family:simsun">发顺丰发顺丰发顺丰发顺丰发顺丰发顺丰发顺丰发顺丰发顺丰,</span>
</span>
</span>
</li>
<li>
<span style="font-size:12pt">
<span style="color:rgb(0, 0, 0)">
<span style="font-family:simsun">
<span style="font-weight:normal">
<span style="tab-stops:list 21.0pt">
<span style="font-family:simsun">发顺丰发顺丰发顺丰发顺丰发顺丰发顺</span>
</span>
</span>
</span>
</span>
</span>
</li>
<li>
<span style="font-size:12pt">
<span style="color:rgb(0, 0, 0)">
<span style="font-family:simsun">
<span style="font-weight:normal">
<span style="tab-stops:list 21.0pt">
<span style="font-family:simsun">发顺丰发顺丰发顺丰发顺丰发顺丰发顺还没立项。</span>
</span>
</span>
</span>
</span>
</span>
<br />
<br />
<span style="font-size:12pt">
<span style="color:rgb(0, 0, 0)">
<span style="font-family:simsun">
<span style="font-weight:normal">
<span style="font-family:simsun">销售预计:</span>
</span>
</span>
</span>
</span>
<br />
<span style="font-size:12pt">
<span style="color:rgb(0, 0, 0)">
<span style="font-family:simsun">
<span style="font-weight:normal">
<span style="font-family:simsun">今年年底有</span>
<span style="font-family:simsun">600 万-700 万的销售
</span>
</span>
</span>
</span>
</span>
<br />
<span style="font-size:12pt">
<span style="color:rgb(0, 0, 0)">
<span style="font-family:simsun">
<span style="font-weight:normal">
<span style="font-family:simsun">2 的发生地方地方撒地方地方阿飞为1 发生地方万的地方 地方撒地 地方第三方润。 </span>
</span>
</span>
</span>
</span>
<br />
<br />
<span style="font-size:12pt">
<span style="color:rgb(0, 0, 0)">
<span style="font-family:simsun">
<span style="font-weight:normal">
<span style="font-family:simsun">打算:一般俄文</span>
<span style="font-family:simsun">60% 、10% (10% 额放入的第一笔付为账,第二俄文% 的款项看工程的长短,根据工程斯蒂芬30% 、3 额未遂犯项目工程为地方撒地方sad 是否的萨芬撒佛挡杀佛第三方年。 </span>
</span>
</span>
</span>
</span>
</li>
</ol>
<p style="margin-left:0in; margin-right:0in">
<br />
</p>
Oops, something went wrong.

0 comments on commit b99fcc2

Please sign in to comment.
You can’t perform that action at this time.