Merge branch 'master' of github.com:doxygen/doxygen

5 files changed, 34 insertions, 10 deletions

diff --git a/src/config.xml b/src/config.xml
index 9c0ccc8..e25c94e 100644
--- a/src/config.xml
+++ b/src/config.xml
@@ -2809,7 +2809,7 @@ doxygen -w latex new_header.tex new_footer.tex new_stylesheet.sty
            as set by \ref cfg_latex_bib_style "LATEX_BIB_STYLE", in case nothing is set the bib style
            `plain` is used.
            This setting is typically used in combination with the block name `CITATIONS_PRESENT`.
- <dt><code>$latexbibfiles</code><dd>will be replaced by the comma separeted list of `bib. files
+ <dt><code>$latexbibfiles</code><dd>will be replaced by the comma separated list of `bib. files
            as set by \ref cfg_cite_bib_files "CITE_BIB_FILES" (when necessary a missing `.bib` is
            automatically added).
            This setting is typically used in combination with the block name `CITATIONS_PRESENT`.
@@ -2832,9 +2832,9 @@ doxygen -w latex new_header.tex new_footer.tex new_stylesheet.sty
            \ref cfg_latex_makeindex_cmd "LATEX_MAKEINDEX_CMD". Then the command doesn't start with
            a backslash, a backslash is automatically prepended. In case the setting is empty the
            command `\makeindex` is used.
- <dt><code>$extralatexpackages</code><dd>will be replaced by commands for usinging the packages set
+ <dt><code>$extralatexpackages</code><dd>will be replaced by commands for using the packages set
            in \ref cfg_extra_packages "EXTRA_PACKAGES".
- <dt><code>$extralatexstylesheet</code><dd>will be replaced by commands for usinging the packages set
+ <dt><code>$extralatexstylesheet</code><dd>will be replaced by commands for using the packages set
            in \ref cfg_latex_extra_stylesheet "LATEX_EXTRA_STYLESHEET" (when the extension is the default
            extension, `.sty`, this extension is stripped for the package name).
  <dt><code>$latexspecialformulachars</code><dd>will be replaced by the code for some special
diff --git a/src/docbookgen.cpp b/src/docbookgen.cpp
index 05e9347..d9e79cb 100644
--- a/src/docbookgen.cpp
+++ b/src/docbookgen.cpp
@@ -256,13 +256,13 @@ void DocbookCodeGenerator::finish()
 }
 void DocbookCodeGenerator::startCodeFragment(const char *)
 {
-DB_GEN_C
+DB_GEN_C1(m_t)
   m_t << "<programlisting>";
 }
 
 void DocbookCodeGenerator::endCodeFragment(const char *)
 {
-DB_GEN_C
+DB_GEN_C1(m_t)
   //endCodeLine checks is there is still an open code line, if so closes it.
   endCodeLine();
 
diff --git a/src/sqlcode.l b/src/sqlcode.l
index 74318bb..c5af17f 100644
--- a/src/sqlcode.l
+++ b/src/sqlcode.l
@@ -378,7 +378,7 @@ SQLCodeParser::SQLCodeParser() : p(std::make_unique<Private>())
 {
   sqlcodeYYlex_init_extra(&p->state, &p->yyscanner);
 #ifdef FLEX_DEBUG
-  sqlcodeYYset_debug(1,yyscanner);
+  sqlcodeYYset_debug(1,p->yyscanner);
 #endif
   resetCodeParserState();
 }
diff --git a/src/translator_br.h b/src/translator_br.h
index 29a0e20..e180f62 100644
--- a/src/translator_br.h
+++ b/src/translator_br.h
@@ -15,9 +15,12 @@
  *        Fabio "FJTC" Jun Takada Chino <fjtc at brokenbits dot com dot br>
  *    Collaborators:
  *        Emerson Ferreira <nuskorpios at gmail dot com>
+ *        Ulisses Guedes <uli1958 at hotmail dot com>
  *    Thanks to Jorge Ramos, Fernando Carijo and others for their contributions.
  *
  * History:
+ * 20200112:
+ * 	- Updated to 1.9.1;
  * 20190203:
  *	- Slice methods added;
  * 20180612:
@@ -49,7 +52,7 @@
 #ifndef TRANSLATOR_BR_H
 #define TRANSLATOR_BR_H
 
-class TranslatorBrazilian : public TranslatorAdapter_1_8_19
+class TranslatorBrazilian : public Translator
 {
   public:
 
@@ -2335,7 +2338,16 @@ class TranslatorBrazilian : public TranslatorAdapter_1_8_19
         return "Dados Membros";
     }
 
-
+    //////////////////////////////////////////////////////////////////////////
+    // new since 1.8.19
+    //////////////////////////////////////////////////////////////////////////
+    
+    /** VHDL design unit documentation */
+	virtual QCString trDesignUnitDocumentation()
+	{ 
+	    return "Documentação da Unidade de Projeto"; 
+    }
+    
 };
 
 #endif
diff --git a/src/translator_pt.h b/src/translator_pt.h
index 3456aad..2273c97 100644
--- a/src/translator_pt.h
+++ b/src/translator_pt.h
@@ -15,6 +15,8 @@
  *       Fabio "FJTC" Jun Takada Chino <fjtc at brokenbits dot com dot br>
  *    Maintainer (until 04/28/2011):
  *       Rui Godinho Lopes <rui at ruilopes.com>
+ *    Collaborators:
+ *        Ulisses Guedes <uli1958 at hotmail dot com>
  *
  * Notes about this translation:
  *    Since I'm Brazilian, this translation may be odd or even incorect for
@@ -24,6 +26,8 @@
  * VERSION HISTORY
  * ---------------
  * History:
+ * 20200112:
+ * 	- Updated to 1.9.1; 
  * 20190203:
  *	- Slice methods added;
  * 20180612:
@@ -59,7 +63,7 @@
 #define TRANSLATOR_PT_H
 
 
-class TranslatorPortuguese : public TranslatorAdapter_1_8_19
+class TranslatorPortuguese : public Translator
 {
   public:
 
@@ -2272,7 +2276,15 @@ class TranslatorPortuguese : public TranslatorAdapter_1_8_19
         return "Dados Membros";
     }
 
-
+    //////////////////////////////////////////////////////////////////////////
+    // new since 1.8.19
+    //////////////////////////////////////////////////////////////////////////
+    
+    /** VHDL design unit documentation */
+	virtual QCString trDesignUnitDocumentation()
+	{ 
+	    return "Documentação da Unidade de Projeto"; 
+    }
 };
 
 #endif