Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Largely successful attempts to get better spacing

Browse Source 
in RTF. This may temporarily break WinHelp RTF but the priority
right now is Word RTF.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25908 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2004-02-21 23:37:01 +00:00
parent 9457cf684e
commit 40126b09cc
2 changed files with 94 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
utils/tex2rtf/src/htmlutil.cpp
View File

@@ -1184,7 +1184,7 @@ void HTMLOnMacro(int macroId, int no_args, bool start)
{ {
if (start) if (start)
{ {
if (inVerbatim) if (TRUE) // (inVerbatim)
TexOutput(_T("~")); TexOutput(_T("~"));
else else
TexOutput(_T(" ")); TexOutput(_T(" "));

135
utils/tex2rtf/src/rtfutils.cpp
View File

@@ -429,22 +429,22 @@ void WriteHeadingStyle(FILE *fd, int heading)
{ {
case 1: case 1:
{ {
wxFprintf(fd, _T("\\b\\fs%d"), chapterFont*2); wxFprintf(fd, _T("\\sb300\\sa260\\f2\\b\\fs%d"), chapterFont*2);
break; break;
} }
case 2: case 2:
{ {
wxFprintf(fd, _T("\\b\\fs%d"), sectionFont*2); wxFprintf(fd, _T("\\sb200\\sa240\\f2\\b\\fs%d"), sectionFont*2);
break; break;
} }
case 3: case 3:
{ {
wxFprintf(fd, _T("\\b\\fs%d"), subsectionFont*2); wxFprintf(fd, _T("\\sb120\\sa240\\f2\\b\\fs%d"), subsectionFont*2);
break; break;
} }
case 4: case 4:
{ {
wxFprintf(fd, _T("\\b\\fs%d"), subsectionFont*2); wxFprintf(fd, _T("\\sb120\\sa240\\f2\\b\\fs%d"), subsectionFont*2);
break; break;
} }
default: default:
@@ -460,12 +460,17 @@ void WriteRTFHeader(FILE *fd)
/* /*
* Style sheet * Style sheet
*/ */
wxFprintf(fd, _T("{\\stylesheet{\\f2\\fs20 \\snext0 Normal;}\n")); wxFprintf(fd, _T("{\\stylesheet{\\f2\\fs22\\sa200 \\snext0 Normal;}\n"));
// Headings // Headings
wxFprintf(fd, _T("{\\s1 ")); WriteHeadingStyle(fd, 1); wxFprintf(fd, _T("\\sbasedon0\\snext0 heading 1;}\n")); wxFprintf(fd, _T("{\\s1 ")); WriteHeadingStyle(fd, 1); wxFprintf(fd, _T("\\sbasedon0\\snext0 heading 1;}\n"));
wxFprintf(fd, _T("{\\s2 ")); WriteHeadingStyle(fd, 2); wxFprintf(fd, _T("\\sbasedon0\\snext0 heading 2;}\n")); wxFprintf(fd, _T("{\\s2 ")); WriteHeadingStyle(fd, 2); wxFprintf(fd, _T("\\sbasedon0\\snext0 heading 2;}\n"));
wxFprintf(fd, _T("{\\s3 ")); WriteHeadingStyle(fd, 3); wxFprintf(fd, _T("\\sbasedon0\\snext0 heading 3;}\n")); wxFprintf(fd, _T("{\\s3 ")); WriteHeadingStyle(fd, 3); wxFprintf(fd, _T("\\sbasedon0\\snext0 heading 3;}\n"));
wxFprintf(fd, _T("{\\s4 ")); WriteHeadingStyle(fd, 4); wxFprintf(fd, _T("\\sbasedon0\\snext0 heading 4;}\n")); wxFprintf(fd, _T("{\\s4 ")); WriteHeadingStyle(fd, 4); wxFprintf(fd, _T("\\sbasedon0\\snext0 heading 4;}\n"));
// Code style
wxFprintf(fd, _T("{\\s10\\ql \\li720\\ri0\\nowidctlpar\\faauto\\rin0\\lin720\\itap0 \\cbpat17\
\\f2\\fs20 \\sbasedon0 \\snext24 Code;}\n"));
// Table of contents styles // Table of contents styles
wxFprintf(fd, _T("{\\s20\\sb300\\tqr\\tldot\\tx8640 \\b\\f2 \\sbasedon0\\snext0 toc 1;}\n")); wxFprintf(fd, _T("{\\s20\\sb300\\tqr\\tldot\\tx8640 \\b\\f2 \\sbasedon0\\snext0 toc 1;}\n"));
@@ -603,6 +608,7 @@ void ProcessText2RTF(TexChunk *chunk)
if (inVerbatim) if (inVerbatim)
{ {
BigBuffer[ptr] = 0; wxStrcat(BigBuffer, _T("\\par\n")); ptr += 5; BigBuffer[ptr] = 0; wxStrcat(BigBuffer, _T("\\par\n")); ptr += 5;
// BigBuffer[ptr] = 0; wxStrcat(BigBuffer, _T("\\par{\\v this was verbatim}\n")); ptr += 5;
i ++; i ++;
changed = TRUE; changed = TRUE;
} }
@@ -1221,9 +1227,10 @@ void RTFOnMacro(int macroId, int no_args, bool start)
} }
} }
OutputCurrentSection(); OutputCurrentSection();
TexOutput(_T("\\par\\pard}\\par\n")); TexOutput(_T("\\par\\pard}\n"));
} }
issuedNewParagraph = 2; issuedNewParagraph = 1;
WriteEnvironmentStyles();
} }
break; break;
} }
@@ -1409,9 +1416,12 @@ void RTFOnMacro(int macroId, int no_args, bool start)
} }
} }
OutputCurrentSection(); OutputCurrentSection();
TexOutput(_T("\\par\\pard}\\par\n")); TexOutput(_T("\\par\\pard}\n"));
// TexOutput(_T("\\par\\pard}\\par\n"));
} }
issuedNewParagraph = 2; issuedNewParagraph = 1;
WriteEnvironmentStyles();
// issuedNewParagraph = 2;
} }
break; break;
} }
@@ -1469,8 +1479,11 @@ void RTFOnMacro(int macroId, int no_args, bool start)
if (!InPopups()) if (!InPopups())
wxFprintf(Subsections, _T("\\page\n")); wxFprintf(Subsections, _T("\\page\n"));
} }
// Experimental JACS 2004-02-21
#if 0
else else
wxFprintf(Chapters, _T("\\par\n")); wxFprintf(Chapters, _T("\\par\n"));
#endif
} }
startedSections = TRUE; startedSections = TRUE;
@@ -1562,9 +1575,13 @@ void RTFOnMacro(int macroId, int no_args, bool start)
} }
} }
OutputCurrentSection(); // Repeat section header OutputCurrentSection(); // Repeat section header
TexOutput(_T("\\par\\pard}\\par\n"));
// Experimental JACS
TexOutput(_T("\\par\\pard}\n"));
// TexOutput(_T("\\par\\pard}\\par\n"));
} }
issuedNewParagraph = 2; issuedNewParagraph = 1;
WriteEnvironmentStyles();
} }
} }
break; break;
@@ -1619,8 +1636,11 @@ void RTFOnMacro(int macroId, int no_args, bool start)
{ {
if (winHelp) if (winHelp)
wxFprintf(Subsubsections, _T("\\page\n")); wxFprintf(Subsubsections, _T("\\page\n"));
// Experimental JACS 2004-02-21
#if 0
else else
wxFprintf(Chapters, _T("\\par\n")); wxFprintf(Chapters, _T("\\par\n"));
#endif
} }
startedSections = TRUE; startedSections = TRUE;
@@ -1705,9 +1725,11 @@ void RTFOnMacro(int macroId, int no_args, bool start)
} }
} }
OutputCurrentSection(); // Repeat section header OutputCurrentSection(); // Repeat section header
TexOutput(_T("\\par\\pard}\\par\n")); TexOutput(_T("\\par\\pard}\n"));
issuedNewParagraph = 2; issuedNewParagraph = 1;
// if (winHelp) TexOutput(_T("\\pard")); WriteEnvironmentStyles();
// TexOutput(_T("\\par\\pard}\\par\n"));
// issuedNewParagraph = 2;
} }
} }
break; break;
@@ -1943,7 +1965,7 @@ void RTFOnMacro(int macroId, int no_args, bool start)
{ {
if (start) if (start)
{ {
if (inVerbatim) if (TRUE) // (inVerbatim)
TexOutput(_T("~")); TexOutput(_T("~"));
else else
TexOutput(_T(" ")); TexOutput(_T(" "));
@@ -1998,8 +2020,11 @@ void RTFOnMacro(int macroId, int no_args, bool start)
{ {
if (indentLevel > 0) if (indentLevel > 0)
{ {
TexOutput(_T("\\par\\par\n")); // Experimental JACS 2004-02-21
issuedNewParagraph = 2; TexOutput(_T("\\par\n"));
issuedNewParagraph = 1;
// TexOutput(_T("\\par\\par\n"));
// issuedNewParagraph = 2;
} }
else else
{ {
@@ -2034,7 +2059,7 @@ void RTFOnMacro(int macroId, int no_args, bool start)
ItemizeStruc *struc = new ItemizeStruc(listType, indentSize2, indentSize1); ItemizeStruc *struc = new ItemizeStruc(listType, indentSize2, indentSize1);
itemizeStack.Insert(struc); itemizeStack.Insert(struc);
wxSprintf(buf, _T("\\tx%d\\tx%d\\li%d"), indentSize1, indentSize2, indentSize2); wxSprintf(buf, _T("\\tx%d\\tx%d\\li%d\\sa200"), indentSize1, indentSize2, indentSize2);
PushEnvironmentStyle(buf); PushEnvironmentStyle(buf);
} }
else else
@@ -2076,7 +2101,7 @@ void RTFOnMacro(int macroId, int no_args, bool start)
itemizeStack.Insert(struc); itemizeStack.Insert(struc);
// wxSprintf(buf, _T("\\tx%d\\li%d\\ri%d"), indentSize, indentSize, TwoColWidthA+TwoColWidthB+oldIndent); // wxSprintf(buf, _T("\\tx%d\\li%d\\ri%d"), indentSize, indentSize, TwoColWidthA+TwoColWidthB+oldIndent);
wxSprintf(buf, _T("\\tx%d\\li%d"), indentSize, indentSize); wxSprintf(buf, _T("\\tx%d\\li%d\\sa200"), indentSize, indentSize);
PushEnvironmentStyle(buf); PushEnvironmentStyle(buf);
} }
else else
@@ -2095,12 +2120,16 @@ void RTFOnMacro(int macroId, int no_args, bool start)
WriteEnvironmentStyles(); WriteEnvironmentStyles();
*/ */
/* why do we need this? */ /* why do we need this? */
// Experimental
TexOutput(_T("\\pard\n"));
#if 0
if (itemizeStack.GetCount() == 0) if (itemizeStack.GetCount() == 0)
{ {
issuedNewParagraph = 0; issuedNewParagraph = 0;
OnMacro(ltPAR, 0, TRUE); OnMacro(ltPAR, 0, TRUE);
OnMacro(ltPAR, 0, FALSE); OnMacro(ltPAR, 0, FALSE);
} }
#endif
} }
break; break;
} }
@@ -2119,12 +2148,14 @@ void RTFOnMacro(int macroId, int no_args, bool start)
int indentSize2 = struc->indentation; int indentSize2 = struc->indentation;
TexOutput(_T("\n")); TexOutput(_T("\n"));
if (struc->currentItem > 1) if (struc->currentItem > 1 && issuedNewParagraph == 0)
{ {
if (currentItemSep > 0) // JACS
TexOutput(_T("\\par")); // if (currentItemSep > 0)
// TexOutput(_T("\\par"));
TexOutput(_T("\\par")); TexOutput(_T("\\par"));
issuedNewParagraph = 1;
// WriteEnvironmentStyles(); // WriteEnvironmentStyles();
} }
@@ -2212,6 +2243,8 @@ void RTFOnMacro(int macroId, int no_args, bool start)
oldIndent = ((ItemizeStruc *)node2->GetData())->indentation; oldIndent = ((ItemizeStruc *)node2->GetData())->indentation;
TexOutput(_T("\n")); TexOutput(_T("\n"));
// JACS
#if 0
if (struc->currentItem > 1) if (struc->currentItem > 1)
{ {
if (currentItemSep > 0) if (currentItemSep > 0)
@@ -2219,6 +2252,7 @@ void RTFOnMacro(int macroId, int no_args, bool start)
// WriteEnvironmentStyles(); // WriteEnvironmentStyles();
} }
#endif
// wxSprintf(buf, _T("\\tx%d\\li%d\\fi-%d\\ri%d\n"), TwoColWidthA, // wxSprintf(buf, _T("\\tx%d\\li%d\\fi-%d\\ri%d\n"), TwoColWidthA,
// TwoColWidthA, TwoColWidthA, TwoColWidthA+TwoColWidthB+oldIndent); // TwoColWidthA, TwoColWidthA, TwoColWidthA+TwoColWidthB+oldIndent);
@@ -2238,6 +2272,8 @@ void RTFOnMacro(int macroId, int no_args, bool start)
{ {
if (start) if (start)
{ {
// JACS
#if 0
if (macroId == ltVERBATIM) if (macroId == ltVERBATIM)
{ {
if (!issuedNewParagraph) if (!issuedNewParagraph)
@@ -2248,7 +2284,12 @@ void RTFOnMacro(int macroId, int no_args, bool start)
} }
else issuedNewParagraph = 0; else issuedNewParagraph = 0;
} }
wxSprintf(buf, _T("{\\f3\\fs20 ")); #endif
if (macroId == ltVERBATIM)
wxSprintf(buf, _T("{\\f3\\s10\\fs20\\li720\\sa0 "));
else
wxSprintf(buf, _T("{\\f3\\fs20 "));
TexOutput(buf); TexOutput(buf);
} }
else else
@@ -2257,8 +2298,12 @@ void RTFOnMacro(int macroId, int no_args, bool start)
if (macroId == ltVERBATIM) if (macroId == ltVERBATIM)
{ {
TexOutput(_T("\\pard\n")); TexOutput(_T("\\pard\n"));
// issuedNewParagraph = 1;
WriteEnvironmentStyles(); WriteEnvironmentStyles();
// JACS
#if 0
TexOutput(_T("\\par\n"));
issuedNewParagraph = 1;
#endif
} }
} }
break; break;
@@ -2268,9 +2313,9 @@ void RTFOnMacro(int macroId, int no_args, bool start)
{ {
if (start) if (start)
{ {
TexOutput(_T("\\fi0\\qc ")); TexOutput(_T("\\qc "));
forbidParindent ++; forbidParindent ++;
PushEnvironmentStyle(_T("\\qc")); PushEnvironmentStyle(_T("\\qc\\sa200"));
} }
else else
{ {
@@ -2286,7 +2331,7 @@ void RTFOnMacro(int macroId, int no_args, bool start)
{ {
if (start) if (start)
{ {
TexOutput(_T("\\fi0\\ql ")); TexOutput(_T("\\ql\\sa200 "));
forbidParindent ++; forbidParindent ++;
PushEnvironmentStyle(_T("\\ql")); PushEnvironmentStyle(_T("\\ql"));
} }
@@ -2304,7 +2349,7 @@ void RTFOnMacro(int macroId, int no_args, bool start)
{ {
if (start) if (start)
{ {
TexOutput(_T("\\fi0\\qr ")); TexOutput(_T("\\qr\\sa200 "));
forbidParindent ++; forbidParindent ++;
PushEnvironmentStyle(_T("\\qr")); PushEnvironmentStyle(_T("\\qr"));
} }
@@ -2526,9 +2571,11 @@ void RTFOnMacro(int macroId, int no_args, bool start)
{ {
TexOutput(_T("\\par\\pard")); TexOutput(_T("\\par\\pard"));
issuedNewParagraph ++; issuedNewParagraph ++;
// Extra par if parskip is more than zero (usually looks best.) // Extra par if parskip is more than zero (usually looks best.)
if (!inTabular && (ParSkip > 0)) // N.B. JACS 2004-02-21: shouldn't need this for linear RTF if
// we have a suitable set of styles.
if (winHelp && !inTabular && (ParSkip > 0))
{ {
TexOutput(_T("\\par")); TexOutput(_T("\\par"));
issuedNewParagraph ++; issuedNewParagraph ++;
@@ -2543,7 +2590,7 @@ void RTFOnMacro(int macroId, int no_args, bool start)
// and ParSkip == 0. // and ParSkip == 0.
// Extra par if parskip is more than zero (usually looks best.) // Extra par if parskip is more than zero (usually looks best.)
if (!inTabular && (ParSkip > 0)) if (winHelp && !inTabular && (ParSkip > 0))
{ {
TexOutput(_T("\\par")); TexOutput(_T("\\par"));
issuedNewParagraph ++; issuedNewParagraph ++;
@@ -3707,7 +3754,7 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
{ {
TexOutput(_T("\\li360\n")); TexOutput(_T("\\li360\n"));
forbidParindent ++; forbidParindent ++;
PushEnvironmentStyle(_T("\\li360")); PushEnvironmentStyle(_T("\\li360\\sa200"));
} }
else else
{ {
@@ -3723,7 +3770,7 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
if (start) if (start)
{ {
TexOutput(_T("\\li360\n")); TexOutput(_T("\\li360\n"));
PushEnvironmentStyle(_T("\\li360")); PushEnvironmentStyle(_T("\\li360\\sa200"));
} }
else else
{ {
@@ -3741,7 +3788,7 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
{ {
if (start) if (start)
{ {
wxSprintf(buf, _T("\\box\\trgaph108%s\n"), ((macroId == ltNORMALBOXD) ? _T("\\brdrdb") : _T("\\brdrs"))); wxSprintf(buf, _T("\\sa200\\box\\trgaph108%s\n"), ((macroId == ltNORMALBOXD) ? _T("\\brdrdb") : _T("\\brdrs")));
TexOutput(buf); TexOutput(buf);
PushEnvironmentStyle(buf); PushEnvironmentStyle(buf);
} }
@@ -4496,8 +4543,8 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
{ {
if (winHelp) if (winHelp)
{ {
TexOutput(_T("\\box\n")); TexOutput(_T("\\sa200\\box\n"));
PushEnvironmentStyle(_T("\\box")); PushEnvironmentStyle(_T("\\sa200\\box"));
} }
else else
{ {
@@ -4526,8 +4573,8 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
{ {
if (winHelp) if (winHelp)
{ {
TexOutput(_T("\\box\n")); TexOutput(_T("\\sa200\\box\n"));
PushEnvironmentStyle(_T("\\box")); PushEnvironmentStyle(_T("\\sa200\\box"));
} }
else else
{ {
@@ -4687,7 +4734,7 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
ItemizeStruc *struc = new ItemizeStruc(LATEX_INDENT, indentSize); ItemizeStruc *struc = new ItemizeStruc(LATEX_INDENT, indentSize);
itemizeStack.Insert(struc); itemizeStack.Insert(struc);
wxSprintf(buf, _T("\\tx%d\\li%d "), indentSize, indentSize); wxSprintf(buf, _T("\\tx%d\\li%d\\sa200 "), indentSize, indentSize);
PushEnvironmentStyle(buf); PushEnvironmentStyle(buf);
TexOutput(buf); TexOutput(buf);
return FALSE; return FALSE;
@@ -4730,7 +4777,7 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
ItemizeStruc *struc = new ItemizeStruc(LATEX_INDENT, indentSize); ItemizeStruc *struc = new ItemizeStruc(LATEX_INDENT, indentSize);
itemizeStack.Insert(struc); itemizeStack.Insert(struc);
wxSprintf(buf, _T("\\tx%d\\li%d\\lr%d\\box%s "), indentSize, indentSize, indentSizeRight, wxSprintf(buf, _T("\\tx%d\\li%d\\lr%d\\sa200\\box%s "), indentSize, indentSize, indentSizeRight,
((macroId == ltCENTEREDBOX) ? _T("\\brdrs") : _T("\\brdrdb"))); ((macroId == ltCENTEREDBOX) ? _T("\\brdrs") : _T("\\brdrdb")));
PushEnvironmentStyle(buf); PushEnvironmentStyle(buf);
TexOutput(buf); TexOutput(buf);
@@ -5154,8 +5201,10 @@ bool RTFGo(void)
wxFprintf(Contents, _T("{\\b\\fs%d %s}\\par\\par\\pard\n\n"), wxFprintf(Contents, _T("{\\b\\fs%d %s}\\par\\par\\pard\n\n"),
(winHelp ? titleFont : chapterFont)*2, ContentsNameString); (winHelp ? titleFont : chapterFont)*2, ContentsNameString);
// By default, Swiss, 10 point. // By default, Swiss, 11 point.
wxFprintf(Chapters, _T("\\f2\\fs20\n")); wxFprintf(Chapters, _T("\\f2\\fs22\n"));
PushEnvironmentStyle(_T("\\f2\\fs22\\sa200"));
SetCurrentOutput(Chapters); SetCurrentOutput(Chapters);
@@ -5174,6 +5223,8 @@ bool RTFGo(void)
} }
WriteRTFHeader(Header); WriteRTFHeader(Header);
fclose(Header); fclose(Header);
PopEnvironmentStyle();
Tex2RTFYield(TRUE); Tex2RTFYield(TRUE);
if (winHelp) if (winHelp)