Release-1.3-rc1-20021207

1 files changed, 10 insertions, 2 deletions

diff --git a/src/latexdocvisitor.cpp b/src/latexdocvisitor.cpp
index 38e335b..645c357 100644
--- a/src/latexdocvisitor.cpp
+++ b/src/latexdocvisitor.cpp
@@ -117,6 +117,8 @@ void LatexDocVisitor::visit(DocSymbol *s)
     case DocSymbol::Hash:    m_t << "\\#"; break;
     case DocSymbol::Percent: m_t << "\\%"; break;
     case DocSymbol::Copy:    m_t << "\\copyright"; break;
+    case DocSymbol::Tm:      m_t << "\\texttrademark"; break;
+    case DocSymbol::Reg:     m_t << "\\textregistered"; break;
     case DocSymbol::Apos:    m_t << "'"; break;
     case DocSymbol::Quot:    m_t << "''"; break;
     case DocSymbol::Uml:     
@@ -406,11 +408,12 @@ void LatexDocVisitor::visitPre(DocSimpleSect *s)
     case DocSimpleSect::Attention:
       m_t << theTranslator->trAttention(); break;
     case DocSimpleSect::User: break;
+    case DocSimpleSect::Rcs: break;
     case DocSimpleSect::Unknown:  break;
   }
 
   // special case 1: user defined title
-  if (s->type()!=DocSimpleSect::User)
+  if (s->type()!=DocSimpleSect::User && s->type()!=DocSimpleSect::Rcs)
   {
     m_t << ":]";
   }
@@ -729,8 +732,13 @@ void LatexDocVisitor::visitPre(DocDotFile *df)
   {
     baseName=baseName.left(baseName.length()-4);
   }
+  if (baseName.right(4)==".dot")
+  {
+    baseName=baseName.left(baseName.length()-4);
+  }
   QString outDir = Config_getString("LATEX_OUTPUT");
-  writeDotGraphFromFile(df->file(),outDir,baseName,EPS);
+  QString name = df->file();
+  writeDotGraphFromFile(name,outDir,baseName,EPS);
   if (df->hasCaption())
   {
     m_t << "\\begin{figure}[H]" << endl;