From: Jakub Adam <jakub.adam@ktknet.cz>
Date: Sat, 2 Jun 2012 21:40:50 +0200
Subject: libhover-fix-automake-texinfo-parser

---
 .../cdt/libhover/texinfoparsers/ParseAutoconfTexinfo.java          |    3 ++-
 .../cdt/libhover/texinfoparsers/ParseAutomakeTexinfo.java          |    4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/src/org/eclipse/linuxtools/cdt/libhover/texinfoparsers/ParseAutoconfTexinfo.java b/libhover/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/src/org/eclipse/linuxtools/cdt/libhover/texinfoparsers/ParseAutoconfTexinfo.java
index 360d494..c944c66 100644
--- a/libhover/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/src/org/eclipse/linuxtools/cdt/libhover/texinfoparsers/ParseAutoconfTexinfo.java
+++ b/libhover/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/src/org/eclipse/linuxtools/cdt/libhover/texinfoparsers/ParseAutoconfTexinfo.java
@@ -559,7 +559,8 @@ public class ParseAutoconfTexinfo {
 						WriteString(os, "      <prototype>");
 						String[] parms = mp.parms;
 						for (int i = 0; i < parms.length; i++) {
-							WriteString(os, "        <parameter content=\"" + parms[i] + "\"/>");
+							String p = parms[i].replaceAll("\"", "&quot;");
+							WriteString(os, "        <parameter content=\"" + p + "\"/>");
 						}
 						WriteString(os, "      </prototype>");
 						mp = mp.nextParms;
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/src/org/eclipse/linuxtools/cdt/libhover/texinfoparsers/ParseAutomakeTexinfo.java b/libhover/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/src/org/eclipse/linuxtools/cdt/libhover/texinfoparsers/ParseAutomakeTexinfo.java
index c61adc0..123e979 100644
--- a/libhover/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/src/org/eclipse/linuxtools/cdt/libhover/texinfoparsers/ParseAutomakeTexinfo.java
+++ b/libhover/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/src/org/eclipse/linuxtools/cdt/libhover/texinfoparsers/ParseAutomakeTexinfo.java
@@ -39,8 +39,8 @@ public class ParseAutomakeTexinfo {
 	// Currently in automake docs, the macro section starts with
 	// a subsection as below and a table which contains macros which
 	// are item and itemx entries.
-	static final String MacrosStart = "@subsection\\sPublic\\smacros";
-	static final String OldMacrosStart = "@section\\sAutoconf\\smacros.*";
+	static final String MacrosStart = "@subsection\\sPublic\\sMacros";
+	static final String OldMacrosStart = "@section\\sAutoconf\\sMacros.*";
 	static final Pattern MacroSection1 = Pattern.compile(MacrosStart);
 	static final Pattern MacroSection2 = Pattern.compile(OldMacrosStart);
 	//                           0