Merge branch '#94_mul_def_cols' into develop

src/latex-struct/LongtableParser.vala

@@ -21,7 +21,10 @@ namespace LAview {
 				this.position = position;
 
 				/* get parameters string */
-				var param_regex = "^(\\[(c|l|r)])?\\{[^{}]*([^{}]*\\{[^{}]*\\}[^{}]*)*\\}";
+				var PAR_REG = "\\|*((>\\{[^{}*]+\\})?[^{}*]+\\{[^{}*]+\\}|[^{}*]+)\\|*";
+				// Bug #94: Parse Multiple defined columns in the tabular/longtable.
+				var param_regex = "^(\\[(c|l|r)])?" + "\\{((\\*\\{[0-9]+\\}\\{"
+				                  + PAR_REG + "\\}|" + PAR_REG + "))*\\}";
 
 				string params = "";
 
@@ -59,16 +62,27 @@ namespace LAview {
 
 				/* match reversed params so '|' will be snapped to the right column */
 				try {
-					var regex = new Regex ("("
+					var col_reg1 = "\\|*}[^{}]+{(p\\|*|m\\|*|b\\|*)(}[^{}]+{>(\\|+$|\\||)|\\|)?";
-					                   + "\\|*}[^{}]+{(p\\|*|m\\|*|b\\|*)(}[^{}]+{>(\\|+$|\\||)|\\|)?"
+					var col_reg2 = "\\|*(r|c|l)(}[^{}]+{@(p\\|*|m\\|*|b\\|*) (r|c|l))?(\\|+$|\\||)";
-					                   + "|"
+					var regex = new Regex ("(" + col_reg1 + "|" + col_reg2
-					                   + "\\|*(r|c|l)(}[^{}]+{@(p\\|*|m\\|*|b\\|*) (r|c|l))?(\\|+$|\\||)"
+					                       // Bug #94: Parse Multiple defined columns...
-					                   + ")");
+					                       + "|\\}" + col_reg1 + "\\{\\}[0-9]+\\{\\*"
+					                       + "|\\}" + col_reg2 + "\\{\\}[0-9]+\\{\\*)");
 					MatchInfo match_info;
 					regex.match_full (params, -1, 0, 0, out match_info);
 					while (match_info.matches ()) {
 						var col_param = new ColParam.with_params (0, "", 0);
 						var word = match_info.fetch (0).reverse ().compress ();
+
+						// Bug #94: Parse Multiple defined columns in the tabular/longtable.
+						int count = 1;
+						if (word[0] == '*') {
+							count = int.parse (word.offset(2));
+							int start;
+							for (start = 2; word[start] != '{'; ++start);
+							word = word[start + 1:word.length - 1];
+						}
+
 						int nllines, nrlines;
 						for (nllines = 0; '|' == word[nllines]; ++nllines);
 						for (nrlines = word.length - 1; nrlines != 0 && '|' == word[nrlines]; --nrlines);
@@ -77,7 +91,10 @@ namespace LAview {
 						col_param.align = word.offset (nllines);
 						col_param.nllines = nllines;
 						col_param.nrlines = wlen - 1 - nrlines;
-						col_params.insert (0, col_param);
+
+						// Bug #94: Parse Multiple defined columns in the tabular/longtable.
+						while (count-- > 0) col_params.insert (0, col_param);
+
 						match_info.next ();
 					}
 				} catch (RegexError e) {}

src/latex-struct/TabularParser.vala

@@ -21,9 +21,10 @@ namespace LAview {
 				this.position = position;
 
 				/* get parameters string */
-				var PARAM_REGEX_FIGBRANCHES = "\\{[^{}]*([^{}]*\\{[^{}]*\\}[^{}]*)*\\}";
+				var PAR_REG = "\\|*((>\\{[^{}*]+\\})?[^{}*]+\\{[^{}*]+\\}|[^{}*]+)\\|*";
-				var param_regex = "^(\\[(t|b)])?" + PARAM_REGEX_FIGBRANCHES + "("
+				// Bug #94: Parse Multiple defined columns in the tabular/longtable.
-				                  + PARAM_REGEX_FIGBRANCHES + ")?";
+				PAR_REG = "\\{((\\*\\{[0-9]+\\}\\{" + PAR_REG + "\\}|" + PAR_REG + "))*\\}";
+				var param_regex = "^(\\[(t|b)])?" + PAR_REG + "(" + PAR_REG + ")?";
 
 				string params = "";
 				uint start_pos = 0, stop_pos = 0;
@@ -55,8 +56,8 @@ namespace LAview {
 
 				/* width */
 				try {
-					if (Regex.match_simple (PARAM_REGEX_FIGBRANCHES + PARAM_REGEX_FIGBRANCHES, params)) {
+					if (Regex.match_simple ("^" + PAR_REG + PAR_REG + "$", params)) {
-						var regex = new Regex (PARAM_REGEX_FIGBRANCHES);
+						var regex = new Regex (PAR_REG);
 						MatchInfo match_info;
 						regex.match (params, 0, out match_info);
 						match_info.fetch_pos (0, out start_pos, out stop_pos);
@@ -74,17 +75,28 @@ namespace LAview {
 
 				/* match reversed params so '|' will be snapped to the right column */
 				try {
-					var regex = new Regex ("("
+					var col_reg1 = "\\|*}[^{}]+{(p\\|*|m\\|*|b\\|*)(}[^{}]+{>(\\|+$|\\||)|\\|)?";
-					                   + "\\|*}[^{}]+{(p\\|*|m\\|*|b\\|*)(}[^{}]+{>(\\|+$|\\||)|\\|)?"
+					var col_reg2 = "\\|*(r|c|l)(}[^{}]+{@(p\\|*|m\\|*|b\\|*) (r|c|l))?(\\|+$|\\||)";
-					                   + "|"
+					var regex = new Regex ("(" + col_reg1 + "|" + col_reg2
-					                   + "\\|*(r|c|l)(}[^{}]+{@(p\\|*|m\\|*|b\\|*) (r|c|l))?(\\|+$|\\||)"
+					                       // Bug #94: Parse Multiple defined columns...
-					                   + ")");
+					                       + "|\\}" + col_reg1 + "\\{\\}[0-9]+\\{\\*"
+					                       + "|\\}" + col_reg2 + "\\{\\}[0-9]+\\{\\*)");
 					params = params.reverse ();
 					MatchInfo match_info;
 					regex.match_full (params, -1, 0, 0, out match_info);
 					while (match_info.matches ()) {
 						var col_param = new ColParam.with_params (0, "", 0);
 						var word = match_info.fetch (0).reverse ().compress ();
+
+						// Bug #94: Parse Multiple defined columns in the tabular/longtable.
+						int count = 1;
+						if (word[0] == '*') {
+							count = int.parse (word.offset(2));
+							int start;
+							for (start = 2; word[start] != '{'; ++start);
+							word = word[start + 1:word.length - 1];
+						}
+
 						int nllines, nrlines;
 						for (nllines = 0; '|' == word[nllines]; ++nllines);
 						for (nrlines = word.length - 1; nrlines != 0 && '|' == word[nrlines]; --nrlines);
@@ -93,7 +105,10 @@ namespace LAview {
 						col_param.align = word.offset (nllines);
 						col_param.nllines = nllines;
 						col_param.nrlines = wlen - 1 - nrlines;
-						col_params.insert (0, col_param);
+
+						// Bug #94: Parse Multiple defined columns in the tabular/longtable.
+						while (count-- > 0) col_params.insert (0, col_param);
+
 						match_info.next ();
 					}
 				} catch (RegexError e) {}

test/parse-test/CMakeLists.txt

@@ -322,5 +322,12 @@ do_parse_test (back_slashes_in_a_table ${PROJECT_SOURCE_DIR}/test/tex/back_slash
 "Original and generated text are EQUAL .-.")
 SET_TESTS_PROPERTIES(ParseTest-back_slashes_in_a_table PROPERTIES ENVIRONMENT "LANG=en")
 
+# test multiply_defined_columns.tex
+do_parse_test (multiply_defined_columns
+    ${PROJECT_SOURCE_DIR}/test/tex/multiply_defined_columns.tex
+    ${PROJECT_SOURCE_DIR}/test/tex/multiply_defined_columns.etalon.tex
+"Original and generated text are EQUAL .-.")
+SET_TESTS_PROPERTIES(ParseTest-multiply_defined_columns PROPERTIES ENVIRONMENT "LANG=en")
+
 # enable testing
 ENABLE_TESTING ()

test/tex/multiply_defined_columns.etalon.tex

@@ -0,0 +1,10 @@
+\begin{tabular}{l|>{\centering}p{0.11\linewidth}||>{\centering}p{0.11\linewidth}||>{\centering}p{0.11\linewidth}|c}
+a & b & c \tabularnewline
+\hline
+a & b & c & d & e & f & g \tabularnewline
+\end{tabular}
+\begin{longtable}{l|>{\centering}p{0.11\linewidth}||>{\centering}p{0.11\linewidth}||>{\centering}p{0.11\linewidth}|c}
+a & b & c \tabularnewline
+\hline
+a & b & c & d & e & f & g \tabularnewline
+\end{longtable}

test/tex/multiply_defined_columns.tex

@@ -0,0 +1,10 @@
+\begin{tabular}{l*{3}{|>{\centering}p{0.11\linewidth}|}c}
+a & b & c \tabularnewline
+\hline
+a & b & c & d & e & f & g \tabularnewline
+\end{tabular}
+\begin{longtable}{l*{3}{|>{\centering}p{0.11\linewidth}|}c}
+a & b & c \tabularnewline
+\hline
+a & b & c & d & e & f & g \tabularnewline
+\end{longtable}