Skip to content

issue #7: Handle \line as newline in RTF2HTMLConverterRFCCompliant #8

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.

Sign up for GitHub

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

Open
basinilya wants to merge 2 commits into
base: master
Choose a base branch
from
Open

issue #7: Handle \line as newline in RTF2HTMLConverterRFCCompliant #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d3295ea
Add Eclipse project files to .gitignore
basinilya Jun 27, 2021
4363831
issue #7: Handle \line as newline in RTF2HTMLConverterRFCCompliant
basinilya Jun 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
.classpath
/.idea
/javadoc
.project
/.settings/*
/target
*.iml
1 change: 1 addition & 0 deletions src/main/java/org/bbottema/rtftohtml/impl/RTF2HTMLConverterRFCCompliant.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ public String rtf2html(@NotNull String rtf) {
charIndex += controlWordMatcher.end() - controlWordMatcher.start();

switch (controlWord) {
case "line":
case "par":
append(result, "\n", currentGroup);
break;
Expand Down
22 changes: 21 additions & 1 deletion src/test/resources/test-messages/input/complex-test.rtf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -740,7 +740,27 @@
{\*\htmltag96 <div style="background-color: #fff">}\htmlrtf {\htmlrtf0 {\*\htmltag64}\htmlrtf {\htmlrtf0
{\*\htmltag84 <img src="https://mailer.mail.ru/pub/mailer/pixel/3001/eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJsZXR0ZXJfaWQiOjMwMDEsImVtYWlsIjoiYmF0bWFuMTExNTU1QG1haWwucnUiLCJ0ZXN0aW5nIjowLCJwb3N0X3R5cGUiOiJDIiwicG9zdF9pZCI6NDIsInNlbmRfdXVpZCI6ImVhNzMzNzU0LTM0MWQtNGQ0Yi04ZDJjLTcwYWMwYzBiOWJmNCIsImxhbmd1YWdlIjoicnUifQ.kBxrr6UFII4HGPuEInkOKX_MpZKSCLhZk6lGnVCJyC8" width="0" height="0" alt="."/>}\htmlrtf {\field{\*\fldinst{HYPERLINK "https://mailer.mail.ru/pub/mailer/pixel/3001/eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJsZXR0ZXJfaWQiOjMwMDEsImVtYWlsIjoiYmF0bWFuMTExNTU1QG1haWwucnUiLCJ0ZXN0aW5nIjowLCJwb3N0X3R5cGUiOiJDIiwicG9zdF9pZCI6NDIsInNlbmRfdXVpZCI6ImVhNzMzNzU0LTM0MWQtNGQ0Yi04ZDJjLTcwYWMwYzBiOWJmNCIsImxhbmd1YWdlIjoicnUifQ.kBxrr6UFII4HGPuEInkOKX_MpZKSCLhZk6lGnVCJyC8"}}{\fldrslt\cf1\ul {\chbrdr\brdrsh .}}}\htmlrtf0 {\*\htmltag72}\htmlrtf\par}\htmlrtf0

{\*\htmltag104 </div>}\htmlrtf }\htmlrtf0
{\*\htmltag104 </div>}\htmlrtf }\htmlrtf0

{\*\htmltag0 \par }

{\*\htmltag128 <pre>}
\htmlrtf {
\pard\plain\f1\fs20 \htmlrtf0 \htmlrtf {
\htmlrtf0 \htmlrtf {\cf4 \fs20 \f5 \htmlrtf0 Received: from ABMAIL13.ci.atlantic-beach.fl.us (10.10.10.21) by\line
ABMAIL13.ci.atlantic-beach.fl.us (10.10.10.21) with Microsoft SMTP Server\line
(TLS) id 15.0.1076.9; Mon, 11 Apr 2016 09:08:47 -0400\line
Received: from ABMAIL13.ci.atlantic-beach.fl.us ([fe80::3d58:a9bc:50f6:e563])\line

by ABMAIL13.ci.atlantic-beach.fl.us ([fe80::3d58:a9bc:50f6:e563%17]) with\line

mapi id 15.00.1076.000; Mon, 11 Apr 2016 09:08:47 -0400\line

}}\htmlrtf0
{\*\htmltag136 </pre>}\htmlrtf }\htmlrtf0

{\*\htmltag0 \par }

{\*\htmltag58 </body>}
{\*\htmltag2 \par }
{\*\htmltag27 </html>}}Jf
25 changes: 24 additions & 1 deletion src/test/resources/test-messages/output/classic/complex-test.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1638,7 +1638,30 @@
<img src="https://mailer.mail.ru/pub/mailer/pixel/3001/eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJsZXR0ZXJfaWQiOjMwMDEsImVtYWlsIjoiYmF0bWFuMTExNTU1QG1haWwucnUiLCJ0ZXN0aW5nIjowLCJwb3N0X3R5cGUiOiJDIiwicG9zdF9pZCI6NDIsInNlbmRfdXVpZCI6ImVhNzMzNzU0LTM0MWQtNGQ0Yi04ZDJjLTcwYWMwYzBiOWJmNCIsImxhbmd1YWdlIjoicnUifQ.kBxrr6UFII4HGPuEInkOKX_MpZKSCLhZk6lGnVCJyC8" width="0" height="0" alt="."/> .


</div>
</div>




<pre>



Received: from ABMAIL13.ci.atlantic-beach.fl.us (10.10.10.21) by
ABMAIL13.ci.atlantic-beach.fl.us (10.10.10.21) with Microsoft SMTP Server
(TLS) id 15.0.1076.9; Mon, 11 Apr 2016 09:08:47 -0400
Received: from ABMAIL13.ci.atlantic-beach.fl.us ([fe80::3d58:a9bc:50f6:e563])

by ABMAIL13.ci.atlantic-beach.fl.us ([fe80::3d58:a9bc:50f6:e563%17]) with

mapi id 15.00.1076.000; Mon, 11 Apr 2016 09:08:47 -0400


</pre>




</body>


Expand Down
10 changes: 9 additions & 1 deletion src/test/resources/test-messages/output/rfcompliant/complex-test.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -870,5 +870,13 @@
</tbody>
</table>
</div>
<div style="background-color: #fff"><img src="https://mailer.mail.ru/pub/mailer/pixel/3001/eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJsZXR0ZXJfaWQiOjMwMDEsImVtYWlsIjoiYmF0bWFuMTExNTU1QG1haWwucnUiLCJ0ZXN0aW5nIjowLCJwb3N0X3R5cGUiOiJDIiwicG9zdF9pZCI6NDIsInNlbmRfdXVpZCI6ImVhNzMzNzU0LTM0MWQtNGQ0Yi04ZDJjLTcwYWMwYzBiOWJmNCIsImxhbmd1YWdlIjoicnUifQ.kBxrr6UFII4HGPuEInkOKX_MpZKSCLhZk6lGnVCJyC8" width="0" height="0" alt="."/></div></body>
<div style="background-color: #fff"><img src="https://mailer.mail.ru/pub/mailer/pixel/3001/eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJsZXR0ZXJfaWQiOjMwMDEsImVtYWlsIjoiYmF0bWFuMTExNTU1QG1haWwucnUiLCJ0ZXN0aW5nIjowLCJwb3N0X3R5cGUiOiJDIiwicG9zdF9pZCI6NDIsInNlbmRfdXVpZCI6ImVhNzMzNzU0LTM0MWQtNGQ0Yi04ZDJjLTcwYWMwYzBiOWJmNCIsImxhbmd1YWdlIjoicnUifQ.kBxrr6UFII4HGPuEInkOKX_MpZKSCLhZk6lGnVCJyC8" width="0" height="0" alt="."/></div>
<pre>Received: from ABMAIL13.ci.atlantic-beach.fl.us (10.10.10.21) by
ABMAIL13.ci.atlantic-beach.fl.us (10.10.10.21) with Microsoft SMTP Server
(TLS) id 15.0.1076.9; Mon, 11 Apr 2016 09:08:47 -0400
Received: from ABMAIL13.ci.atlantic-beach.fl.us ([fe80::3d58:a9bc:50f6:e563])
by ABMAIL13.ci.atlantic-beach.fl.us ([fe80::3d58:a9bc:50f6:e563%17]) with
mapi id 15.00.1076.000; Mon, 11 Apr 2016 09:08:47 -0400
</pre>
</body>
</html>
25 changes: 24 additions & 1 deletion src/test/resources/test-messages/output/swing/complex-test.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1638,7 +1638,30 @@
<img src="https://mailer.mail.ru/pub/mailer/pixel/3001/eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJsZXR0ZXJfaWQiOjMwMDEsImVtYWlsIjoiYmF0bWFuMTExNTU1QG1haWwucnUiLCJ0ZXN0aW5nIjowLCJwb3N0X3R5cGUiOiJDIiwicG9zdF9pZCI6NDIsInNlbmRfdXVpZCI6ImVhNzMzNzU0LTM0MWQtNGQ0Yi04ZDJjLTcwYWMwYzBiOWJmNCIsImxhbmd1YWdlIjoicnUifQ.kBxrr6UFII4HGPuEInkOKX_MpZKSCLhZk6lGnVCJyC8" width="0" height="0" alt="."/> .


</div>
</div>




<pre>



Received: from ABMAIL13.ci.atlantic-beach.fl.us (10.10.10.21) by
ABMAIL13.ci.atlantic-beach.fl.us (10.10.10.21) with Microsoft SMTP Server
(TLS) id 15.0.1076.9; Mon, 11 Apr 2016 09:08:47 -0400
Received: from ABMAIL13.ci.atlantic-beach.fl.us ([fe80::3d58:a9bc:50f6:e563])

by ABMAIL13.ci.atlantic-beach.fl.us ([fe80::3d58:a9bc:50f6:e563%17]) with

mapi id 15.00.1076.000; Mon, 11 Apr 2016 09:08:47 -0400


</pre>




</body>


Expand Down