diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/formula.cpp | 2 | ||||
| -rw-r--r-- | src/htags.cpp | 2 | ||||
| -rw-r--r-- | src/htmldocvisitor.cpp | 20 | ||||
| -rw-r--r-- | src/htmlgen.cpp | 5 | ||||
| -rw-r--r-- | src/index.h | 1 | ||||
| -rw-r--r-- | src/rtfgen.cpp | 31 |
6 files changed, 30 insertions, 31 deletions
diff --git a/src/formula.cpp b/src/formula.cpp index ad37782..182ddaa 100644 --- a/src/formula.cpp +++ b/src/formula.cpp @@ -132,6 +132,7 @@ void FormulaList::generateBitmaps(const char *path) { err("Problems running dvips. Check your installation!\n"); portable_sysTimerStop(); + QDir::setCurrent(oldDir); return; } portable_sysTimerStop(); @@ -192,6 +193,7 @@ void FormulaList::generateBitmaps(const char *path) { err("Problem running ghostscript %s %s. Check your installation!\n",portable_ghostScriptCommand(),gsArgs); portable_sysTimerStop(); + QDir::setCurrent(oldDir); return; } portable_sysTimerStop(); diff --git a/src/htags.cpp b/src/htags.cpp index c910eb6..460d54d 100644 --- a/src/htags.cpp +++ b/src/htags.cpp @@ -59,7 +59,7 @@ bool Htags::execute(const QCString &htmldir) } else { - err("If you use USE_HTAGS then INPUT should specific a single directory. \n"); + err("If you use USE_HTAGS then INPUT should specify a single directory.\n"); return FALSE; } diff --git a/src/htmldocvisitor.cpp b/src/htmldocvisitor.cpp index 99d6fdd..0ce4030 100644 --- a/src/htmldocvisitor.cpp +++ b/src/htmldocvisitor.cpp @@ -1902,24 +1902,8 @@ void HtmlDocVisitor::filterQuotedCdataAttr(const char* str) { case '&': m_t << "&"; break; case '"': m_t << """; break; - // For SGML compliance, and given the SGML declaration for HTML syntax, - // it's enough to replace these two, provided that the declaration - // for the HTML version we generate (and as supported by the browser) - // specifies that all the other symbols used in rawVal are - // within the right character class (i.e., they're not - // some multinational weird characters not in the BASESET). - // We assume that 1) the browser will support whatever is remaining - // in the formula and 2) the TeX formulae are generally governed - // by even stricter character restrictions so it should be enough. - // - // On some incompliant browsers, additional translation of - // '>' and '<' into ">" and "<", respectively, might be needed; - // but I'm unaware of particular modern (last 4 years) versions - // with such problems, so let's not do it for performance. - // Also, some brousers will (wrongly) not process the entity references - // inside the attribute value and show the &...; form instead, - // so we won't create entites unless necessary to minimize clutter there. - // --vassilii + case '<': m_t << "<"; break; + case '>': m_t << ">"; break; default: m_t << c; } } diff --git a/src/htmlgen.cpp b/src/htmlgen.cpp index a2dd473..dadbb4f 100644 --- a/src/htmlgen.cpp +++ b/src/htmlgen.cpp @@ -1952,11 +1952,6 @@ static void endQuickIndexItem(FTextStream &t,const char *l) t << "</li>\n"; } -static QCString fixSpaces(const QCString &s) -{ - return substitute(s," "," "); -} - static bool quickLinkVisible(LayoutNavEntry::Kind kind) { static bool showFiles = Config_getBool("SHOW_FILES"); diff --git a/src/index.h b/src/index.h index 150d23f..ace3614 100644 --- a/src/index.h +++ b/src/index.h @@ -284,5 +284,6 @@ void initNamespaceMemberIndices(); void addClassMemberNameToIndex(MemberDef *md); void addFileMemberNameToIndex(MemberDef *md); void addNamespaceMemberNameToIndex(MemberDef *md); +QCString fixSpaces(const QCString &s); #endif diff --git a/src/rtfgen.cpp b/src/rtfgen.cpp index 7baaa3c..811efd8 100644 --- a/src/rtfgen.cpp +++ b/src/rtfgen.cpp @@ -541,6 +541,7 @@ void RTFGenerator::endIndexSection(IndexSections is) bool fortranOpt = Config_getBool("OPTIMIZE_FOR_FORTRAN"); bool vhdlOpt = Config_getBool("OPTIMIZE_OUTPUT_VHDL"); static bool sourceBrowser = Config_getBool("SOURCE_BROWSER"); + static QCString projectName = Config_getString("PROJECT_NAME"); switch (is) { @@ -549,7 +550,7 @@ void RTFGenerator::endIndexSection(IndexSections is) // User has overridden document title in extensions file t << "}" << rtf_title; else - t << "}" << Config_getString("PROJECT_NAME"); + t << "}" << projectName; break; case isTitlePageAuthor: { @@ -578,7 +579,17 @@ void RTFGenerator::endIndexSection(IndexSections is) } t << rtf_Style_Reset << rtf_Style["Title"]->reference << endl; // set to title style - t << "{\\field\\fldedit {\\*\\fldinst TITLE \\\\*MERGEFORMAT}{\\fldrslt TITLE}}\\par" << endl; + if (rtf_title) + // User has overridden document title in extensions file + t << "{\\field\\fldedit {\\*\\fldinst " << rtf_title << " \\\\*MERGEFORMAT}{\\fldrslt " << rtf_title << "}}\\par" << endl; + else + { + DocText *root = validatingParseText(projectName); + t << "{\\field\\fldedit {\\*\\fldinst TITLE \\\\*MERGEFORMAT}{\\fldrslt "; + writeDoc(root,0,0); + t << "}}\\par" << endl; + + } t << rtf_Style_Reset << rtf_Style["SubTitle"]->reference << endl; // set to title style t << "\\par\n"; @@ -593,10 +604,14 @@ void RTFGenerator::endIndexSection(IndexSections is) t << "\\par\\par\\par\\par\\par\\par\\par\\par\\par\\par\\par\\par\n"; t << rtf_Style_Reset << rtf_Style["SubTitle"]->reference << endl; // set to subtitle style - t << "{\\field\\fldedit {\\*\\fldinst AUTHOR \\\\*MERGEFORMAT}{\\fldrslt AUTHOR}}\\par" << endl; - t << "Version " << Config_getString("PROJECT_NUMBER") << "\\par"; + if (rtf_author) + t << "{\\field\\fldedit {\\*\\fldinst AUTHOR \\\\*MERGEFORMAT}{\\fldrslt "<< rtf_author << " }}\\par" << endl; + else + t << "{\\field\\fldedit {\\*\\fldinst AUTHOR \\\\*MERGEFORMAT}{\\fldrslt AUTHOR}}\\par" << endl; + + t << theTranslator->trVersion() << " " << Config_getString("PROJECT_NUMBER") << "\\par"; t << "{\\field\\fldedit {\\*\\fldinst CREATEDATE \\\\*MERGEFORMAT}" - "{\\fldrslt CREATEDATE}}\\par"<<endl; + "{\\fldrslt "<< dateToString(FALSE) << " }}\\par"<<endl; t << "\\page\\page"; DBG_RTF(t << "{\\comment End title page}" << endl) @@ -2363,7 +2378,7 @@ static bool preProcessFile(QDir &d,QCString &infName, FTextStream &t, bool bIncl // files because the first line before the body // ALWAYS contains "{\comment begin body}" int len; - do + for(;;) { lineBuf.resize(maxLineLength); if ((len=f.readLine(lineBuf.rawData(),maxLineLength))==-1) @@ -2372,8 +2387,9 @@ static bool preProcessFile(QDir &d,QCString &infName, FTextStream &t, bool bIncl return FALSE; } lineBuf.resize(len+1); + if (lineBuf.find("\\comment begin body")!=-1) break; if (bIncludeHeader) encodeForOutput(t,lineBuf.data()); - } while (lineBuf.find("\\comment begin body")==-1); + } lineBuf.resize(maxLineLength); @@ -2590,6 +2606,7 @@ bool RTFGenerator::preProcessFileInplace(const char *path,const char *name) if (!outf.open(IO_WriteOnly)) { err("Failed to open %s for writing!\n",combinedName.data()); + QDir::setCurrent(oldDir); return FALSE; } FTextStream outt(&outf); |