- Windows changes and fixes

3 files changed, 17 insertions, 25 deletions

diff --git a/src/xmlcomposer.cpp b/src/xmlcomposer.cpp
index dcd4c34..2b65833 100644
--- a/src/xmlcomposer.cpp
+++ b/src/xmlcomposer.cpp
@@ -711,7 +711,7 @@ ON_INITIALIZE(FontTable)
 
 ON_GROUPSTART(FontTable)
 {
-    // Each group should be a style
+    // Each group should be a font
     AN_ANALYSER(Font);
 }
 
diff --git a/test-files/sample.xml b/test-files/sample.xml
index d1b1318..78279ea 100644
--- a/test-files/sample.xml
+++ b/test-files/sample.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><document><stylesheet><style name="Normal"/><style name="heading 1"/><style name="footnote text"/></stylesheet><info><title>This is a test RTF</title><author>Nate</author><operator>Nate</operator></info><para style="heading 1"><i_fonttable><font id="0" name="Times New Roman"/><font id="1" name="Arial"/><font id="2" name="Courier New"/><font id="3" name="Symbol"/><font id="10" name="Wingdings"/><font id="121" name="Times New Roman CE"/><font id="122" name="Times New Roman Cyr"/><font id="124" name="Times New Roman Greek"/><font id="125" name="Times New Roman Tur"/><font id="126" name="Times New Roman (Hebrew)"/><font id="127" name="Times New Roman (Arabic)"/><font id="128" name="Times New Roman Baltic"/><font id="129" name="Times New Roman (Vietnamese)"/><font id="131" name="Arial CE"/><font id="132" name="Arial Cyr"/><font id="134" name="Arial Greek"/><font id="135" name="Arial Tur"/><font id="136" name="Arial (Hebrew)"/><font id="137" name="Arial (Arabic)"/><font id="138" name="Arial Baltic"/><font id="139" name="Arial (Vietnamese)"/><font id="141" name="Courier New CE"/><font id="142" name="Courier New Cyr"/><font id="144" name="Courier New Greek"/><font id="145" name="Courier New Tur"/><font id="146" name="Courier New (Hebrew)"/><font id="147" name="Courier New (Arabic)"/><font id="148" name="Courier New Baltic"/><font id="149" name="Courier New (Vietnamese)"/></i_fonttable><font id="1" size="32"><b>This is a test RTF</b></font></para><para><font size="24">Hi! I’m a test file. This is some </font><font size="24"><b>bold</b></font><font size="24"> text, and some </font><font size="24"><i>italic</i></font><font size="24"> text, as well as some </font><font size="24"><u>underline</u></font><font size="24"> text. And a bit of </font><font size="24"><hide>hidden</hide></font><font size="24"> text. So we’re going to end this paragraph here and go on to a nice little list:</font></para><para/><list type="disc" ordered="0" start="1"><para><font size="24">Item 1</font></para><para><font size="24">Item 2</font></para><para><font size="24">Item 3</font></para><para><font size="24">Item 4</font></para></list><para/><para><font size="24">And now comes a fun table:</font></para><para/><table><row><cell><para><font size="24">Cell 1</font></para></cell><cell><para><font size="24">Cell 2</font></para><para><font size="24">More in cell 2</font></para></cell><cell><para><font size="24">Cell 3</font></para></cell></row><row><cell><para><font size="24">Next row</font></para></cell><cell><para><font size="24">Next row </font></para></cell><cell><para><font size="24">Next row</font></para></cell></row></table><para/><para><font size="24">A page break:</font></para><page/><para><font size="24">And here we’re on the next page.</font><font size="24"> </font></para><para><font size="24">This para has a </font><ref type="footnote" to="1"><font size="24"><super>1</super></font></ref><font size="24">footnote.</font></para><para><font size="24">And here’s yet another paragraph. </font></para><para/><footnote id="1"><para><font size="20"><super>1</super></font><font size="20"> This is the actual content of the footnote.</font></para></footnote></document>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><document><stylesheet><style name="Normal"/><style name="heading 1"/><style name="footnote text"/></stylesheet><info><title>This is a test RTF</title><author>Nate</author><operator>Nate</operator></info><para style="heading 1"><i_fonttable><font id="0" name="Times New Roman"/><font id="1" name="Arial"/><font id="2" name="Courier New"/><font id="3" name="Symbol"/><font id="10" name="Wingdings"/><font id="121" name="Times New Roman CE"/><font id="122" name="Times New Roman Cyr"/><font id="124" name="Times New Roman Greek"/><font id="125" name="Times New Roman Tur"/><font id="126" name="Times New Roman (Hebrew)"/><font id="127" name="Times New Roman (Arabic)"/><font id="128" name="Times New Roman Baltic"/><font id="129" name="Times New Roman (Vietnamese)"/><font id="131" name="Arial CE"/><font id="132" name="Arial Cyr"/><font id="134" name="Arial Greek"/><font id="135" name="Arial Tur"/><font id="136" name="Arial (Hebrew)"/><font id="137" name="Arial (Arabic)"/><font id="138" name="Arial Baltic"/><font id="139" name="Arial (Vietnamese)"/><font id="141" name="Courier New CE"/><font id="142" name="Courier New Cyr"/><font id="144" name="Courier New Greek"/><font id="145" name="Courier New Tur"/><font id="146" name="Courier New (Hebrew)"/><font id="147" name="Courier New (Arabic)"/><font id="148" name="Courier New Baltic"/><font id="149" name="Courier New (Vietnamese)"/></i_fonttable><b>This is a test RTF</b></para><para>Hi! I’m a test file. This is some <b>bold</b> text, and some <i>italic</i> text, as well as some <u>underline</u> text. And a bit of <hide>hidden</hide> text. So we’re going to end this paragraph here and go on to a nice little list:</para><para/><list type="disc" ordered="0" start="1"><para>Item 1</para><para>Item 2</para><para>Item 3</para><para>Item 4</para></list><para/><para>And now comes a fun table:</para><para/><table><row><cell><para>Cell 1</para></cell><cell><para>Cell 2</para><para>More in cell 2</para></cell><cell><para>Cell 3</para></cell></row><row><cell><para>Next row</para></cell><cell><para>Next row </para></cell><cell><para>Next row</para></cell></row></table><para/><para>A page break:</para><page/><para>And here we’re on the next page. </para><para>This para has a <ref type="footnote" to="1"><super>1</super></ref>footnote.</para><para>And here’s yet another paragraph. </para><para/><footnote id="1"><para><super>1</super> This is the actual content of the footnote.</para></footnote></document>
diff --git a/win32/rtfx.dsp b/win32/rtfx.dsp
index 06aa8d1..f89ca96 100644
--- a/win32/rtfx.dsp
+++ b/win32/rtfx.dsp
@@ -90,10 +90,6 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
-SOURCE=..\src\basehandler.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=..\src\domhelpers.cpp
 # End Source File
 # Begin Source File
@@ -102,28 +98,28 @@ SOURCE=..\src\levelhandler.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\xmlcomposer.cpp
+SOURCE=..\src\rtfparser.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\xmlfixups.cpp
+SOURCE=..\src\rtfx.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\xmlcomposehelpers.cpp
+SOURCE=..\src\sablotr.cpp
+# SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\rtfparser.cpp
+SOURCE=..\src\xmlcomposehelpers.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\rtfx.cpp
+SOURCE=..\src\xmlcomposer.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\sablotr.cpp
-# SUBTRACT CPP /YX /Yc /Yu
+SOURCE=..\src\xmlfixups.cpp
 # End Source File
 # End Group
 # Begin Group "Header Files"
@@ -131,10 +127,6 @@ SOURCE=..\src\sablotr.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl"
 # Begin Source File
 
-SOURCE=..\src\basehandler.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\src\domhelpers.h
 # End Source File
 # Begin Source File
@@ -147,35 +139,35 @@ SOURCE=..\src\reference.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\xmlcomposer.h
+SOURCE=..\src\rtfformatting.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\xmlfixups.h
+SOURCE=..\src\rtfparser.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\rtfformatting.h
+SOURCE=..\src\sablo.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\xmlcomposehelpers.h
+SOURCE=..\src\tags.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\rtfparser.h
+SOURCE=..\src\usuals.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\sablo.h
+SOURCE=..\src\xmlcomposehelpers.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\tags.h
+SOURCE=..\src\xmlcomposer.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\usuals.h
+SOURCE=..\src\xmlfixups.h
 # End Source File
 # End Group
 # Begin Group "Resource Files"