diff options
| -rw-r--r-- | src/latexgen.cpp | 1 | ||||
| -rw-r--r-- | src/message.cpp | 2 | ||||
| -rw-r--r-- | src/message.h | 2 | ||||
| -rw-r--r-- | src/template.cpp | 4 | ||||
| -rw-r--r-- | src/util.cpp | 6 |
5 files changed, 8 insertions, 7 deletions
diff --git a/src/latexgen.cpp b/src/latexgen.cpp index 6db6148..8b8c835 100644 --- a/src/latexgen.cpp +++ b/src/latexgen.cpp @@ -323,6 +323,7 @@ static void writeDefaultHeaderPart1(FTextStream &t) " \\fontseries{bc}\\selectfont%\n" " \\color{darkgray}%\n" "}\n" + "\\newcommand{\\+}{\\discretionary{\\mbox{\\scriptsize$\\hookleftarrow$}}{}{}}\n" "\n"; // Define page & text layout diff --git a/src/message.cpp b/src/message.cpp index ff5dac2..dad3e0e 100644 --- a/src/message.cpp +++ b/src/message.cpp @@ -172,7 +172,7 @@ void warn(const char *file,int line,const char *fmt, ...) va_end(args); } -void warn(const char *file,int line,const char *fmt,va_list args) +void va_warn(const char *file,int line,const char *fmt,va_list args) { do_warn("WARNINGS", file, line, warning_str, fmt, args); } diff --git a/src/message.h b/src/message.h index 2875e81..ca76a20 100644 --- a/src/message.h +++ b/src/message.h @@ -23,7 +23,7 @@ extern void msg(const char *fmt, ...); extern void warn(const char *file,int line,const char *fmt, ...); -extern void warn(const char *file,int line,const char *fmt, va_list args); +extern void va_warn(const char *file,int line,const char *fmt, va_list args); extern void warn_simple(const char *file,int line,const char *text); extern void warn_undoc(const char *file,int line,const char *fmt, ...); extern void warn_doc_error(const char *file,int line,const char *fmt, ...); diff --git a/src/template.cpp b/src/template.cpp index 793d769..ea3c673 100644 --- a/src/template.cpp +++ b/src/template.cpp @@ -1713,7 +1713,7 @@ void TemplateContextImpl::warn(const char *fileName,int line,const char *fmt,... { va_list args; va_start(args,fmt); - ::warn(fileName,line,fmt,args); + va_warn(fileName,line,fmt,args); va_end(args); m_engine->printIncludeContext(fileName,line); } @@ -3342,7 +3342,7 @@ void TemplateParser::warn(const char *fileName,int line,const char *fmt,...) con { va_list args; va_start(args,fmt); - ::warn(fileName,line,fmt,args); + va_warn(fileName,line,fmt,args); va_end(args); m_engine->printIncludeContext(fileName,line); } diff --git a/src/util.cpp b/src/util.cpp index f38f108..91f6fda 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -6527,9 +6527,9 @@ void filterLatexString(FTextStream &t,const char *str, case '^': t << "$^\\wedge$"; break; case '&': t << "\\&"; break; case '*': t << "$\\ast$"; break; - case '_': if (!insideTabbing) t << "\\-"; + case '_': if (!insideTabbing) t << "\\+"; t << "\\_"; - if (!insideTabbing) t << "\\-"; + if (!insideTabbing) t << "\\+"; break; case '{': t << "\\{"; break; case '}': t << "\\}"; break; @@ -6566,7 +6566,7 @@ void filterLatexString(FTextStream &t,const char *str, ((c>='A' && c<='Z' && pc!=' ' && pc!='\0') || (c==':' && pc!=':') || (pc=='.' && isId(c))) ) { - t << "\\-"; + t << "\\+"; } t << (char)c; } |