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

more compilation fixes (tex2rtf now builds again)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17590 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2002-10-20 22:17:49 +00:00
parent 8677ac53d2
commit 4a5fc54878
5 changed files with 63 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -191,7 +191,7 @@ void ReopenFile(FILE **fd, char **fileName)
else else
sprintf(buf, "%s%d.html", FileRoot, fileId); sprintf(buf, "%s%d.html", FileRoot, fileId);
if (*fileName) delete[] *fileName; if (*fileName) delete[] *fileName;
*fileName = copystring(FileNameFromPath(buf)); *fileName = copystring(wxFileNameFromPath(buf));
*fd = fopen(buf, "w"); *fd = fopen(buf, "w");
fprintf(*fd, "<HTML>\n"); fprintf(*fd, "<HTML>\n");
} }
@@ -426,13 +426,13 @@ void AddBrowseButtons(char *upLabel, char *upFilename,
if (truncateFilenames) if (truncateFilenames)
{ {
char buf1[80]; char buf1[80];
strcpy(buf1, ConvertCase(FileNameFromPath(FileRoot))); strcpy(buf1, ConvertCase(wxFileNameFromPath(FileRoot)));
sprintf(buf, "\n<A HREF=\"%s.%s\">%s</A> ", buf1, ConvertCase("htm"), contentsReference); sprintf(buf, "\n<A HREF=\"%s.%s\">%s</A> ", buf1, ConvertCase("htm"), contentsReference);
} }
else else
{ {
char buf1[80]; char buf1[80];
strcpy(buf1, ConvertCase(FileNameFromPath(FileRoot))); strcpy(buf1, ConvertCase(wxFileNameFromPath(FileRoot)));
sprintf(buf, "\n<A HREF=\"%s%s\">%s</A> ", buf1, ConvertCase("_contents.html"), contentsReference); sprintf(buf, "\n<A HREF=\"%s%s\">%s</A> ", buf1, ConvertCase("_contents.html"), contentsReference);
} }
// TexOutput("<NOFRAMES>"); // TexOutput("<NOFRAMES>");
@@ -711,9 +711,9 @@ void HTMLOnMacro(int macroId, int no_args, bool start)
char titleBuf[200]; char titleBuf[200];
if (truncateFilenames) if (truncateFilenames)
sprintf(titleBuf, "%s.htm", FileNameFromPath(FileRoot)); sprintf(titleBuf, "%s.htm", wxFileNameFromPath(FileRoot));
else else
sprintf(titleBuf, "%s_contents.html", FileNameFromPath(FileRoot)); sprintf(titleBuf, "%s_contents.html", wxFileNameFromPath(FileRoot));
fprintf(Chapters, "<A NAME=\"%s\"></A>", topicName); fprintf(Chapters, "<A NAME=\"%s\"></A>", topicName);
@@ -2711,9 +2711,9 @@ bool HTMLOnArgument(int macroId, int arg_no, bool start)
char titleBuf[150]; char titleBuf[150];
if (truncateFilenames) if (truncateFilenames)
sprintf(titleBuf, "%s.htm", FileNameFromPath(FileRoot)); sprintf(titleBuf, "%s.htm", wxFileNameFromPath(FileRoot));
else else
sprintf(titleBuf, "%s_contents.html", FileNameFromPath(FileRoot)); sprintf(titleBuf, "%s_contents.html", wxFileNameFromPath(FileRoot));
HTMLHead(); HTMLHead();
TexOutput("<title>"); TexOutput("<title>");
@@ -2922,7 +2922,7 @@ bool HTMLGo(void)
OnError("Cannot open output file!"); OnError("Cannot open output file!");
return FALSE; return FALSE;
} }
AddTexRef("contents", FileNameFromPath(TitlepageName), ContentsNameString); AddTexRef("contents", wxFileNameFromPath(TitlepageName), ContentsNameString);
fprintf(Contents, "<P><P><H2>%s</H2><P><P>\n", ContentsNameString); fprintf(Contents, "<P><P><H2>%s</H2><P><P>\n", ContentsNameString);
@@ -3006,7 +3006,7 @@ bool HTMLGo(void)
if (contentsString) if (contentsString)
fprintf(tmpTitle, "<TITLE>%s</TITLE></HEAD>\n\n", contentsString); fprintf(tmpTitle, "<TITLE>%s</TITLE></HEAD>\n\n", contentsString);
else else
fprintf(tmpTitle, "<TITLE>%s</TITLE></HEAD>\n\n", FileNameFromPath(FileRoot)); fprintf(tmpTitle, "<TITLE>%s</TITLE></HEAD>\n\n", wxFileNameFromPath(FileRoot));
} }
// Output frame information // Output frame information
@@ -3020,8 +3020,8 @@ bool HTMLGo(void)
fprintf(tmpTitle, "<FRAMESET COLS=\"30%%,70%%\">\n"); fprintf(tmpTitle, "<FRAMESET COLS=\"30%%,70%%\">\n");
fprintf(tmpTitle, "<FRAME SRC=\"%s\">\n", ConvertCase(FileNameFromPath(contentsFrameName))); fprintf(tmpTitle, "<FRAME SRC=\"%s\">\n", ConvertCase(wxFileNameFromPath(contentsFrameName)));
fprintf(tmpTitle, "<FRAME SRC=\"%s\" NAME=\"mainwindow\">\n", ConvertCase(FileNameFromPath(firstFileName))); fprintf(tmpTitle, "<FRAME SRC=\"%s\" NAME=\"mainwindow\">\n", ConvertCase(wxFileNameFromPath(firstFileName)));
fprintf(tmpTitle, "</FRAMESET>\n"); fprintf(tmpTitle, "</FRAMESET>\n");
fprintf(tmpTitle, "<NOFRAMES>\n"); fprintf(tmpTitle, "<NOFRAMES>\n");
@@ -3052,7 +3052,7 @@ bool HTMLGo(void)
fprintf(tmpTitle, "\n</HTML>\n"); fprintf(tmpTitle, "\n</HTML>\n");
fclose(tmpTitle); fclose(tmpTitle);
if (FileExists(TitlepageName)) wxRemoveFile(TitlepageName); if (wxFileExists(TitlepageName)) wxRemoveFile(TitlepageName);
if (!wxRenameFile("title.tmp", TitlepageName)) if (!wxRenameFile("title.tmp", TitlepageName))
{ {
wxCopyFile("title.tmp", TitlepageName); wxCopyFile("title.tmp", TitlepageName);
@@ -3065,7 +3065,7 @@ bool HTMLGo(void)
if (lastTopic) delete[] lastTopic; if (lastTopic) delete[] lastTopic;
lastTopic = NULL; lastTopic = NULL;
if (FileExists(ContentsName)) wxRemoveFile(ContentsName); if (wxFileExists(ContentsName)) wxRemoveFile(ContentsName);
if (!wxRenameFile(TmpContentsName, ContentsName)) if (!wxRenameFile(TmpContentsName, ContentsName))
{ {
@@ -3150,11 +3150,11 @@ void GenerateHTMLWorkshopFiles(char *fname)
"Default topic=%s\n" "Default topic=%s\n"
"Index file=%s.hhk\n" "Index file=%s.hhk\n"
"Title=", "Title=",
FileNameFromPath(fname), wxFileNameFromPath(fname),
FileNameFromPath(fname), wxFileNameFromPath(fname),
FileNameFromPath(fname), wxFileNameFromPath(fname),
FileNameFromPath(TitlepageName), wxFileNameFromPath(TitlepageName),
FileNameFromPath(fname) wxFileNameFromPath(fname)
); );
if (DocumentTitle) { if (DocumentTitle) {
@@ -3165,19 +3165,19 @@ void GenerateHTMLWorkshopFiles(char *fname)
fprintf(f, "\n\n[WINDOWS]\n" fprintf(f, "\n\n[WINDOWS]\n"
"%sHelp=,\"%s.hhc\",\"%s.hhk\",\"%s\",,,,,,0x2420,,0x380e,,,,,0,,,", "%sHelp=,\"%s.hhc\",\"%s.hhk\",\"%s\",,,,,,0x2420,,0x380e,,,,,0,,,",
FileNameFromPath(fname), wxFileNameFromPath(fname),
FileNameFromPath(fname), wxFileNameFromPath(fname),
FileNameFromPath(fname), wxFileNameFromPath(fname),
FileNameFromPath(TitlepageName)); wxFileNameFromPath(TitlepageName));
fprintf(f, "\n\n[FILES]\n"); fprintf(f, "\n\n[FILES]\n");
fprintf(f, "%s\n", FileNameFromPath(TitlepageName)); fprintf(f, "%s\n", wxFileNameFromPath(TitlepageName));
for (int i = 1; i <= fileId; i++) { for (int i = 1; i <= fileId; i++) {
if (truncateFilenames) if (truncateFilenames)
sprintf(buf, "%s%d.htm", FileNameFromPath(FileRoot), i); sprintf(buf, "%s%d.htm", wxFileNameFromPath(FileRoot), i);
else else
sprintf(buf, "%s%d.html", FileNameFromPath(FileRoot), i); sprintf(buf, "%s%d.html", wxFileNameFromPath(FileRoot), i);
fprintf(f, "%s\n", buf); fprintf(f, "%s\n", buf);
} }
fclose(f); fclose(f);
@@ -3281,7 +3281,7 @@ void HTMLWorkshopStartContents()
"<LI> <OBJECT type=\"text/sitemap\">\n" "<LI> <OBJECT type=\"text/sitemap\">\n"
"<param name=\"Local\" value=\"%s\">\n" "<param name=\"Local\" value=\"%s\">\n"
"<param name=\"Name\" value=\"Contents\">\n</OBJECT>\n", "<param name=\"Name\" value=\"Contents\">\n</OBJECT>\n",
FileNameFromPath(TitlepageName) wxFileNameFromPath(TitlepageName)
); );
} }

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

@@ -527,7 +527,7 @@ bool WriteHPJ(char *filename)
StripExtension(hpjFilename); StripExtension(hpjFilename);
strcat(hpjFilename, ".hpj"); strcat(hpjFilename, ".hpj");
strcpy(helpFile, FileNameFromPath(filename)); strcpy(helpFile, wxFileNameFromPath(filename));
StripExtension(helpFile); StripExtension(helpFile);
strcpy(rtfFile, helpFile); strcpy(rtfFile, helpFile);
strcat(helpFile, ".hlp"); strcat(helpFile, ".hlp");
@@ -1195,7 +1195,7 @@ void RTFOnMacro(int macroId, int no_args, bool start)
fprintf(Chapters, "!{\\footnote DisableButton(\"Up\")}\n"); fprintf(Chapters, "!{\\footnote DisableButton(\"Up\")}\n");
else else
fprintf(Chapters, "!{\\footnote EnableButton(\"Up\");ChangeButtonBinding(\"Up\", \"JumpId(`%s.hlp', `%s')\")}\n", fprintf(Chapters, "!{\\footnote EnableButton(\"Up\");ChangeButtonBinding(\"Up\", \"JumpId(`%s.hlp', `%s')\")}\n",
FileNameFromPath(FileRoot), "Contents"); wxFileNameFromPath(FileRoot), "Contents");
} }
} }
@@ -1350,12 +1350,12 @@ void RTFOnMacro(int macroId, int no_args, bool start)
if (DocumentStyle == LATEX_ARTICLE) if (DocumentStyle == LATEX_ARTICLE)
{ {
fprintf(Sections, "!{\\footnote EnableButton(\"Up\");ChangeButtonBinding(\"Up\", \"JumpId(`%s.hlp', `%s')\")}\n", fprintf(Sections, "!{\\footnote EnableButton(\"Up\");ChangeButtonBinding(\"Up\", \"JumpId(`%s.hlp', `%s')\")}\n",
FileNameFromPath(FileRoot), "Contents"); wxFileNameFromPath(FileRoot), "Contents");
} }
else if (CurrentChapterName) else if (CurrentChapterName)
{ {
fprintf(Sections, "!{\\footnote EnableButton(\"Up\");ChangeButtonBinding(\"Up\", \"JumpId(`%s.hlp', `%s')\")}\n", fprintf(Sections, "!{\\footnote EnableButton(\"Up\");ChangeButtonBinding(\"Up\", \"JumpId(`%s.hlp', `%s')\")}\n",
FileNameFromPath(FileRoot), CurrentChapterName); wxFileNameFromPath(FileRoot), CurrentChapterName);
} }
} }
} }
@@ -1501,7 +1501,7 @@ void RTFOnMacro(int macroId, int no_args, bool start)
if (useUpButton && CurrentSectionName) if (useUpButton && CurrentSectionName)
{ {
fprintf(Subsections, "!{\\footnote EnableButton(\"Up\");ChangeButtonBinding(\"Up\", \"JumpId(`%s.hlp', `%s')\")}\n", fprintf(Subsections, "!{\\footnote EnableButton(\"Up\");ChangeButtonBinding(\"Up\", \"JumpId(`%s.hlp', `%s')\")}\n",
FileNameFromPath(FileRoot), CurrentSectionName); wxFileNameFromPath(FileRoot), CurrentSectionName);
} }
} }
if (!winHelp && indexSubsections && useWord) if (!winHelp && indexSubsections && useWord)
@@ -1647,7 +1647,7 @@ void RTFOnMacro(int macroId, int no_args, bool start)
if (useUpButton && CurrentSubsectionName) if (useUpButton && CurrentSubsectionName)
{ {
fprintf(Subsubsections, "!{\\footnote EnableButton(\"Up\");ChangeButtonBinding(\"Up\", \"JumpId(`%s.hlp', `%s')\")}\n", fprintf(Subsubsections, "!{\\footnote EnableButton(\"Up\");ChangeButtonBinding(\"Up\", \"JumpId(`%s.hlp', `%s')\")}\n",
FileNameFromPath(FileRoot), CurrentSubsectionName); wxFileNameFromPath(FileRoot), CurrentSubsectionName);
} }
} }
if (!winHelp && indexSubsections && useWord) if (!winHelp && indexSubsections && useWord)
@@ -4897,7 +4897,7 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
if (useUpButton) if (useUpButton)
{ {
fprintf(Chapters, "!{\\footnote EnableButton(\"Up\");ChangeButtonBinding(\"Up\", \"JumpId(`%s.hlp', `%s')\")}\n", fprintf(Chapters, "!{\\footnote EnableButton(\"Up\");ChangeButtonBinding(\"Up\", \"JumpId(`%s.hlp', `%s')\")}\n",
FileNameFromPath(FileRoot), "Contents"); wxFileNameFromPath(FileRoot), "Contents");
} }
} }
@@ -5247,7 +5247,7 @@ bool RTFGo(void)
{ {
wxConcatFiles("header.rtf", "chapters.rtf", "tmp1.rtf"); wxConcatFiles("header.rtf", "chapters.rtf", "tmp1.rtf");
Tex2RTFYield(TRUE); Tex2RTFYield(TRUE);
if (FileExists(OutputFile)) if (wxFileExists(OutputFile))
wxRemoveFile(OutputFile); wxRemoveFile(OutputFile);
char *cwdStr; char *cwdStr;
@@ -5273,7 +5273,7 @@ bool RTFGo(void)
wxRemoveFile("tmp1.rtf"); wxRemoveFile("tmp1.rtf");
} }
if (FileExists(ContentsName)) wxRemoveFile(ContentsName); if (wxFileExists(ContentsName)) wxRemoveFile(ContentsName);
if (!wxRenameFile(TmpContentsName, ContentsName)) if (!wxRenameFile(TmpContentsName, ContentsName))
{ {

4
utils/tex2rtf/src/tex2any.h
View File

@@ -173,6 +173,10 @@ int GetCurrentColumn(void); // number of characters on current line
char *ConvertCase(char *s); // Convert case, according to upperCaseNames setting. char *ConvertCase(char *s); // Convert case, according to upperCaseNames setting.
extern wxPathList TexPathList; // Path list, can be used for file searching. extern wxPathList TexPathList; // Path list, can be used for file searching.
#if !WXWIN_COMPATIBILITY_2
extern bool StringMatch(const wxChar *one, const wxChar *two, bool subString = TRUE, bool exact = FALSE);
#endif
// Define a variable value from the .ini file // Define a variable value from the .ini file
char *RegisterSetting(char *settingName, char *settingValue, bool interactive = TRUE); char *RegisterSetting(char *settingName, char *settingValue, bool interactive = TRUE);

24
utils/tex2rtf/src/texutils.cpp
View File

@@ -1143,7 +1143,7 @@ char *RegisterSetting(char *settingName, char *settingValue, bool interactive)
else if (StringMatch(settingName, "authorFontSize", FALSE, TRUE)) else if (StringMatch(settingName, "authorFontSize", FALSE, TRUE))
StringToInt(settingValue, &authorFont); StringToInt(settingValue, &authorFont);
else if (StringMatch(settingName, "ignoreInput", FALSE, TRUE)) else if (StringMatch(settingName, "ignoreInput", FALSE, TRUE))
IgnorableInputFiles.Add(FileNameFromPath(settingValue)); IgnorableInputFiles.Add(wxFileNameFromPath(settingValue));
else if (StringMatch(settingName, "mirrorMargins", FALSE, TRUE)) else if (StringMatch(settingName, "mirrorMargins", FALSE, TRUE))
mirrorMargins = StringTobool(settingValue); mirrorMargins = StringTobool(settingValue);
else if (StringMatch(settingName, "runTwice", FALSE, TRUE)) else if (StringMatch(settingName, "runTwice", FALSE, TRUE))
@@ -1671,3 +1671,25 @@ char *ConvertCase(char *s)
buf[i] = 0; buf[i] = 0;
return buf; return buf;
} }
#if !WXWIN_COMPATIBILITY_2
// if substring is TRUE, search for str1 in str2
bool StringMatch(const wxChar *str1, const wxChar *str2, bool subString,
bool exact)
{
if (subString)
{
wxString Sstr1(str1);
wxString Sstr2(str2);
if (!exact)
{
Sstr1.MakeUpper();
Sstr2.MakeUpper();
}
return Sstr2.Index(Sstr1) != wxNOT_FOUND;
}
else
return exact ? wxString(str2).Cmp(str1) == 0 :
wxString(str2).CmpNoCase(str1) == 0;
}
#endif

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

@@ -1195,7 +1195,7 @@ bool XLPGo(void)
fclose(Subsubsections); Subsubsections = NULL; fclose(Subsubsections); Subsubsections = NULL;
fclose(Index); Index = NULL; fclose(Index); Index = NULL;
if (FileExists(ContentsName)) wxRemoveFile(ContentsName); if (wxFileExists(ContentsName)) wxRemoveFile(ContentsName);
if (!wxRenameFile(TmpContentsName, ContentsName)) if (!wxRenameFile(TmpContentsName, ContentsName))
{ {