head 1.3; access; symbols pkgsrc-2015Q3:1.2.0.96 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.94 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.92 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.90 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.88 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.86 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.84 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.82 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.80 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.78 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.76 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.74 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.72 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.70 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.68 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.66 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.64 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.62 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.60 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.58 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.56 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.54 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.52 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.50 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.48 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.46 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.44 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.42 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.40 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.38 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.36 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.34 pkgsrc-2008Q1:1.2.0.32 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.30 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.28 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.26 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.24 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.22 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.20 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.18 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.16 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.14 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.12 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.10 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.8 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.6 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.4 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.2 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.1.0.2 pkgsrc-2004Q1-base:1.1; locks; strict; comment @# @; 1.3 date 2015.10.24.19.16.25; author joerg; state dead; branches; next 1.2; commitid uk7CGk97p4ZnzoGy; 1.2 date 2004.03.30.18.23.46; author ben; state Exp; branches; next 1.1; 1.1 date 2003.12.20.16.00.56; author ben; state Exp; branches; next ; desc @@ 1.3 log @Retire tex2rtf, a wxWidgets tool that seem to no longer be maintained. @ text @$NetBSD: patch-ac,v 1.2 2004/03/30 18:23:46 ben Exp $ --- rtfutils.cpp.orig Mon Jul 15 15:54:46 2002 +++ rtfutils.cpp @@@@ -527,7 +527,7 @@@@ bool WriteHPJ(char *filename) StripExtension(hpjFilename); strcat(hpjFilename, ".hpj"); - strcpy(helpFile, FileNameFromPath(filename)); + strcpy(helpFile, wxFileNameFromPath(filename)); StripExtension(helpFile); strcpy(rtfFile, helpFile); strcat(helpFile, ".hlp"); @@@@ -1195,7 +1195,7 @@@@ void RTFOnMacro(int macroId, int no_args fprintf(Chapters, "!{\\footnote DisableButton(\"Up\")}\n"); else 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 if (DocumentStyle == LATEX_ARTICLE) { fprintf(Sections, "!{\\footnote EnableButton(\"Up\");ChangeButtonBinding(\"Up\", \"JumpId(`%s.hlp', `%s')\")}\n", - FileNameFromPath(FileRoot), "Contents"); + wxFileNameFromPath(FileRoot), "Contents"); } else if (CurrentChapterName) { 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 if (useUpButton && CurrentSectionName) { fprintf(Subsections, "!{\\footnote EnableButton(\"Up\");ChangeButtonBinding(\"Up\", \"JumpId(`%s.hlp', `%s')\")}\n", - FileNameFromPath(FileRoot), CurrentSectionName); + wxFileNameFromPath(FileRoot), CurrentSectionName); } } if (!winHelp && indexSubsections && useWord) @@@@ -1647,7 +1647,7 @@@@ void RTFOnMacro(int macroId, int no_args if (useUpButton && CurrentSubsectionName) { fprintf(Subsubsections, "!{\\footnote EnableButton(\"Up\");ChangeButtonBinding(\"Up\", \"JumpId(`%s.hlp', `%s')\")}\n", - FileNameFromPath(FileRoot), CurrentSubsectionName); + wxFileNameFromPath(FileRoot), CurrentSubsectionName); } } if (!winHelp && indexSubsections && useWord) @@@@ -4772,10 +4772,10 @@@@ bool RTFOnArgument(int macroId, int arg_ { if (MinorDocumentStyleString) { - if (StringMatch("twoside", MinorDocumentStyleString)) + if (wxStringMatch2("twoside", MinorDocumentStyleString)) // Mirror margins, switch on odd/even headers & footers, and break sections at odd pages TexOutput("\\margmirror\\facingp\\sbkodd"); - if (StringMatch("twocolumn", MinorDocumentStyleString)) + if (wxStringMatch2("twocolumn", MinorDocumentStyleString)) TexOutput("\\cols2"); } TexOutput("\n"); @@@@ -4897,7 +4897,7 @@@@ bool RTFOnArgument(int macroId, int arg_ if (useUpButton) { 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"); Tex2RTFYield(TRUE); - if (FileExists(OutputFile)) + if (wxFileExists(OutputFile)) wxRemoveFile(OutputFile); char *cwdStr; @@@@ -5273,7 +5273,7 @@@@ bool RTFGo(void) wxRemoveFile("tmp1.rtf"); } - if (FileExists(ContentsName)) wxRemoveFile(ContentsName); + if (wxFileExists(ContentsName)) wxRemoveFile(ContentsName); if (!wxRenameFile(TmpContentsName, ContentsName)) { @ 1.2 log @Update tex2rtf to version 2.01. A changelog is not available, but this version of tex2rtf is updated to work with newer versions of wxwindows, and the prior version is referred to as obsolete. I am told that some of the patches duplicate work that is done in CVS, so some patches should disappear over time. @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @Make this build with gcc3 * remove unnecessary ios::nocreate http://www.dinkumware.com/manuals/reader.aspx?b=p/&h=fstream.html#basic_filebuf::open * add using namespace std to get min() @ text @d3 5 a7 3 --- texutils.cpp.orig 1997-06-05 16:17:46.000000000 -0700 +++ texutils.cpp @@@@ -390,7 +390,7 @@@@ void WriteTexReferences(char *filename) d9 13 a21 5 void ReadTexReferences(char *filename) { - ifstream istr(filename, ios::nocreate | ios::in); + ifstream istr(filename, ios::in); if (istr.bad()) return; d23 62 a84 8 char label[100]; @@@@ -554,7 +554,7 @@@@ void BibReadValue(istream& istr, char *b Bool ReadBib(char *filename) { char buf[300]; - ifstream istr(filename, ios::nocreate | ios::in); + ifstream istr(filename, ios::in); if (istr.bad()) return FALSE; d86 7 a92 2 BibLine = 1; @@@@ -1271,7 +1271,7 @@@@ char *RegisterSetting(char *settingName, d94 2 a95 7 Bool ReadCustomMacros(char *filename) { - ifstream istr(filename, ios::nocreate | ios::in); + ifstream istr(filename, ios::in); if (istr.bad()) return FALSE; CustomMacroList.Clear(); @