Browse Source

Merge branch 'release-0.1.10'

master v0.1.10
Kolan Sh 5 years ago
parent
commit
01cc801d41
4 changed files with 11 additions and 9 deletions
  1. +1
    -1
      CMakeLists.txt
  2. +2
    -1
      cpack/CMakeLists.txt
  3. +4
    -3
      src/latex-struct/Subtable.vala
  4. +4
    -4
      src/latex-struct/TableParser.vala

+ 1
- 1
CMakeLists.txt View File

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


+ 2
- 1
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 (LICENSE "LGPLv3+")
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)

+ 4
- 3
src/latex-struct/Subtable.vala View File

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


+ 4
- 4
src/latex-struct/TableParser.vala View File

@ -63,7 +63,7 @@ namespace LAview {
uint matched_tag_abspos_right) throws ParseError {
// TODO: Similar ro TabularParser::process_tabularnewline (), make a template method?
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;
} else {
TokenType token = add_cell (subcontents);
@ -346,10 +346,10 @@ namespace LAview {
TOPRULE, MIDRULE, CMIDRULE, BOTTOMRULE, NOALIGN, ADDLINESPACE
}
void end_subtable (Table.ATable table,
void end_subtable (ATable table,
TableTagType subtable_type, uint tag_left_abspos) {
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;
} else {
subtable.after = contents[row_abs_pos:tag_left_abspos];
@ -385,7 +385,7 @@ namespace LAview {
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 matched_tag_length = fifo_is_tag (local_tokens_to_class_start, out tag);
var message = "";


Loading…
Cancel
Save