kolan
/
LAview.LaTeX-Struct
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'release-0.1.10'

This commit is contained in:
Kolan Sh 2016-03-20 02:40:04 +03:00
parent 4ff168ff45 790162755d
commit 01cc801d41
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -7,7 +7,7 @@ SET (PROJECT_DESCRIPTION "LaTeX representation in the memory.")
SET (MAJOR 0) SET (MAJOR 0)
SET (MINOR 1) SET (MINOR 1)
SET (PATCH 9) SET (PATCH 10)
LIST (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/backbone) LIST (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/backbone)

3
cpack/CMakeLists.txt
View File

@ -5,5 +5,6 @@ SET (REDHAT_DEPENDENCIES "vala >= 0.24, glib >= 2.33, libgee >= 0.16")
SET (REDHAT_SECTION "Applications/Text") SET (REDHAT_SECTION "Applications/Text")
SET (LICENSE "LGPLv3+") SET (LICENSE "LGPLv3+")
SET (WIN32_UNINSTALL_NAME "LVLatStr") # <= 8 symbols for the name SET (WIN32_UNINSTALL_NAME "LVLatStr") # <= 8 symbols for the name
SET (CPACK_NSIS_MENU_LINKS "https://redmine.backbone.ws/projects/latex-struct"
"Homepage for LAview/LaTeX-Struct")
INCLUDE (CPackCommonRules) INCLUDE (CPackCommonRules)

7
src/latex-struct/Subtable.vala
View File

@ -10,7 +10,7 @@ namespace LAview {
/** /**
* Caption of the table. * Caption of the table.
*/ */
public string caption { get; set; default = ""; } public Text caption { get; set; default = new Text(""); }
/** /**
* Any text before the ``Subtable``. * Any text before the ``Subtable``.
@ -316,8 +316,9 @@ namespace LAview {
s.append (before); s.append (before);
if (caption != "") { var caption_text = caption.generate ();
s.append (caption); if (caption_text != "") {
s.append (caption_text);
if (size != 0) if (size != 0)
s.append ("\\tabularnewline"); s.append ("\\tabularnewline");
} }

8
src/latex-struct/TableParser.vala
View File

@ -63,7 +63,7 @@ namespace LAview {
uint matched_tag_abspos_right) throws ParseError { uint matched_tag_abspos_right) throws ParseError {
// TODO: Similar ro TabularParser::process_tabularnewline (), make a template method? // TODO: Similar ro TabularParser::process_tabularnewline (), make a template method?
if (in_caption) { if (in_caption) {
subtable.caption = contents[row_abs_pos:tag_left_abspos].compress (); subtable.caption = new Text (contents[row_abs_pos:tag_left_abspos].compress ());
in_caption = false; in_caption = false;
} else { } else {
TokenType token = add_cell (subcontents); TokenType token = add_cell (subcontents);
@ -346,10 +346,10 @@ namespace LAview {
TOPRULE, MIDRULE, CMIDRULE, BOTTOMRULE, NOALIGN, ADDLINESPACE TOPRULE, MIDRULE, CMIDRULE, BOTTOMRULE, NOALIGN, ADDLINESPACE
} }
void end_subtable (Table.ATable table, void end_subtable (ATable table,
TableTagType subtable_type, uint tag_left_abspos) { TableTagType subtable_type, uint tag_left_abspos) {
if (in_caption) { if (in_caption) {
subtable.caption = contents[row_abs_pos:tag_left_abspos].compress (); subtable.caption = new Text (contents[row_abs_pos:tag_left_abspos].compress ());
in_caption = false; in_caption = false;
} else { } else {
subtable.after = contents[row_abs_pos:tag_left_abspos]; subtable.after = contents[row_abs_pos:tag_left_abspos];
@ -385,7 +385,7 @@ namespace LAview {
subtable = new Subtable (); subtable = new Subtable ();
} }
protected TokenType scan_tex_symbol (Table.ATable table) throws ParseError { protected TokenType scan_tex_symbol (ATable table) throws ParseError {
var tag = 0U; var tag = 0U;
var matched_tag_length = fifo_is_tag (local_tokens_to_class_start, out tag); var matched_tag_length = fifo_is_tag (local_tokens_to_class_start, out tag);
var message = ""; var message = "";