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

Tweaks for WinHelp RTF - a few spacing problems remain

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25912 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2004-02-22 11:29:39 +00:00
parent 4c7848f1e4
commit 6e084216cf
1 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1176,7 +1176,10 @@ void RTFOnMacro(int macroId, int no_args, bool start)
OutputCurrentSection(); OutputCurrentSection();
if (winHelp) if (winHelp)
wxFprintf(Contents, _T("}{\\v %s}\\par\\pard\n"), topicName); {
wxFprintf(Contents, _T("}{\\v %s}\\pard\\par\n"), topicName);
//WriteEnvironmentStyles();
}
else if ((macroId == ltCHAPTER) || (macroId == ltCHAPTERHEADING)) else if ((macroId == ltCHAPTER) || (macroId == ltCHAPTERHEADING))
wxFprintf(Contents, _T("}\\par\\par\\pard\n")); wxFprintf(Contents, _T("}\\par\\par\\pard\n"));
@@ -1333,7 +1336,10 @@ void RTFOnMacro(int macroId, int no_args, bool start)
if (winHelp) if (winHelp)
{ {
if (!InPopups()) if (!InPopups())
wxFprintf(jumpFrom, _T("}{\\v %s}\\par\\pard\n"), topicName); {
wxFprintf(jumpFrom, _T("}{\\v %s}\\pard\\par\n"), topicName);
//WriteEnvironmentStyles();
}
} }
else if ((macroId != ltSECTIONSTAR) && (macroId != ltGLOSS)) else if ((macroId != ltSECTIONSTAR) && (macroId != ltGLOSS))
{ {
@@ -1497,7 +1503,10 @@ void RTFOnMacro(int macroId, int no_args, bool start)
if (winHelp) if (winHelp)
{ {
if (!InPopups()) if (!InPopups())
wxFprintf(Sections, _T("}{\\v %s}\\par\\pard\n"), topicName); {
wxFprintf(Sections, _T("}{\\v %s}\\pard\\par\n"), topicName);
//WriteEnvironmentStyles();
}
} }
else if ((macroId != ltSUBSECTIONSTAR) && (macroId != ltMEMBERSECTION) && else if ((macroId != ltSUBSECTIONSTAR) && (macroId != ltMEMBERSECTION) &&
(macroId != ltFUNCTIONSECTION)) (macroId != ltFUNCTIONSECTION))
@@ -1652,7 +1661,10 @@ void RTFOnMacro(int macroId, int no_args, bool start)
OutputCurrentSection(); OutputCurrentSection();
if (winHelp) if (winHelp)
wxFprintf(Subsections, _T("}{\\v %s}\\par\\pard\n"), topicName); {
wxFprintf(Subsections, _T("}{\\v %s}\\pard\\par\n"), topicName);
//WriteEnvironmentStyles();
}
else if ((DocumentStyle == LATEX_ARTICLE) && (macroId != ltSUBSUBSECTIONSTAR)) else if ((DocumentStyle == LATEX_ARTICLE) && (macroId != ltSUBSUBSECTIONSTAR))
wxFprintf(Contents, _T("\\par\\pard\n")); wxFprintf(Contents, _T("\\par\\pard\n"));
@@ -2575,11 +2587,13 @@ void RTFOnMacro(int macroId, int no_args, bool start)
// Extra par if parskip is more than zero (usually looks best.) // Extra par if parskip is more than zero (usually looks best.)
// N.B. JACS 2004-02-21: shouldn't need this for linear RTF if // N.B. JACS 2004-02-21: shouldn't need this for linear RTF if
// we have a suitable set of styles. // we have a suitable set of styles.
#if 0
if (winHelp && !inTabular && (ParSkip > 0)) if (winHelp && !inTabular && (ParSkip > 0))
{ {
TexOutput(_T("\\par")); TexOutput(_T("\\par"));
issuedNewParagraph ++; issuedNewParagraph ++;
} }
#endif
WriteEnvironmentStyles(); WriteEnvironmentStyles();
} }
// 1 is a whole paragraph if ParSkip == 0, // 1 is a whole paragraph if ParSkip == 0,
@@ -2589,12 +2603,14 @@ void RTFOnMacro(int macroId, int no_args, bool start)
// Don't need a par at all if we've already had one, // Don't need a par at all if we've already had one,
// and ParSkip == 0. // and ParSkip == 0.
#if 0
// Extra par if parskip is more than zero (usually looks best.) // Extra par if parskip is more than zero (usually looks best.)
if (winHelp && !inTabular && (ParSkip > 0)) if (winHelp && !inTabular && (ParSkip > 0))
{ {
TexOutput(_T("\\par")); TexOutput(_T("\\par"));
issuedNewParagraph ++; issuedNewParagraph ++;
} }
#endif
WriteEnvironmentStyles(); WriteEnvironmentStyles();
} }
/* /*
@@ -4921,7 +4937,10 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
wxChar *topicName = _T("bibliography"); wxChar *topicName = _T("bibliography");
if (winHelp) if (winHelp)
{
wxFprintf(Contents, _T("{\\v %s}\\par\\pard\n"), topicName); wxFprintf(Contents, _T("{\\v %s}\\par\\pard\n"), topicName);
WriteEnvironmentStyles();
}
else else
wxFprintf(Contents, _T("\\par\\par\\pard\n")); wxFprintf(Contents, _T("\\par\\par\\pard\n"));