diff --git a/program/code/functional_tests/PASScomplicatedTable/texfilelonger.pdf b/program/code/functional_tests/PASScomplicatedTable/texfilelonger.pdf index 548a103b..c9802064 100644 Binary files a/program/code/functional_tests/PASScomplicatedTable/texfilelonger.pdf and b/program/code/functional_tests/PASScomplicatedTable/texfilelonger.pdf differ diff --git a/program/code/functional_tests/PASScomplicatedTable/texfilelonger.tex b/program/code/functional_tests/PASScomplicatedTable/texfilelonger.tex index 781e89ce..81ca65c5 100644 --- a/program/code/functional_tests/PASScomplicatedTable/texfilelonger.tex +++ b/program/code/functional_tests/PASScomplicatedTable/texfilelonger.tex @@ -1,4 +1,5 @@ \documentclass{article} + \begin{document} \begin{tabular}{ l | c | r } test & 2 & test \\ diff --git a/program/code/functional_tests/PASScomplicatedTable/texfilelonger.tex.html b/program/code/functional_tests/PASScomplicatedTable/texfilelonger.tex.html index 91adcdef..b7090eed 100644 --- a/program/code/functional_tests/PASScomplicatedTable/texfilelonger.tex.html +++ b/program/code/functional_tests/PASScomplicatedTable/texfilelonger.tex.html @@ -1 +1 @@ -
test 2 test
4 5 6
\ No newline at end of file +
test 2 test
4 5 6
\ No newline at end of file diff --git a/program/code/functional_tests/PassparametersTable/texfilelonger.pdf b/program/code/functional_tests/PassparametersTable/texfilelonger.pdf index a820f09f..d93913e5 100644 Binary files a/program/code/functional_tests/PassparametersTable/texfilelonger.pdf and b/program/code/functional_tests/PassparametersTable/texfilelonger.pdf differ diff --git a/program/code/functional_tests/PassparametersTable/texfilelonger.tex b/program/code/functional_tests/PassparametersTable/texfilelonger.tex index 82045dde..f54117c5 100644 --- a/program/code/functional_tests/PassparametersTable/texfilelonger.tex +++ b/program/code/functional_tests/PassparametersTable/texfilelonger.tex @@ -1,7 +1,7 @@ \documentclass{article} \usepackage{array} \begin{document} -\begin{tabular}{ p{1pt} | m{1pt} | b{1pt} } +\begin{tabular}{ p{30pt} | m{5pt} | b{5pt} } test & 2 & test \\ 4 & 5 & 6 \\ \end{tabular} diff --git a/program/code/functional_tests/PassparametersTable/texfilelonger.tex.html b/program/code/functional_tests/PassparametersTable/texfilelonger.tex.html index 22ef8842..891544a1 100644 --- a/program/code/functional_tests/PassparametersTable/texfilelonger.tex.html +++ b/program/code/functional_tests/PassparametersTable/texfilelonger.tex.html @@ -1 +1 @@ -
test 2 test
4 5 6
\ No newline at end of file +
test 2 test
4 5 6
\ No newline at end of file diff --git a/program/code/main.py b/program/code/main.py index 5f366675..9b7c045c 100644 --- a/program/code/main.py +++ b/program/code/main.py @@ -329,7 +329,7 @@ def translate_column(latex_column): """ Translate insides of a single latex tabular column to html """ - hline_string_literal = "hline" + hline_string_literal = "\\hline" replaced_hline = latex_column.replace(hline_string_literal, "
") replaced_newline = replaced_hline.replace("\newline", "
") return replaced_newline @@ -340,12 +340,12 @@ def handle_line_strings(line_string, """ Converts lines untill there are no more lines """ - current_style = column_style[column_number - 1] + current_style = column_style[column_number] if current_style == line_string: while current_style == line_string: return_string += line_string column_number += 1 - current_style = column_style[column_number - 1] + current_style = column_style[column_number] return return_string, column_number @@ -498,7 +498,7 @@ def handle_table_whole(html_string, data, table_start, table_end): parameters_start_index = data.find( "{", table_start + len(tabular_begin_string)) - parameters_end_index = data.find(" }", parameters_start_index) + parameters_end_index = data.find("}", parameters_start_index) parameters_string = data[parameters_start_index: parameters_end_index + 1] parameters_array = tabular_required_parameters(parameters_string) inside_table = data[parameters_end_index + 1: table_end] diff --git a/program/unit_tests/test_code/test_translate_inside_to_html.py b/program/unit_tests/test_code/test_translate_inside_to_html.py index db469183..a949a1a5 100644 --- a/program/unit_tests/test_code/test_translate_inside_to_html.py +++ b/program/unit_tests/test_code/test_translate_inside_to_html.py @@ -9,5 +9,7 @@ def given_correct_then_correct(): assert translate_inside_to_html(latex_string, column_styles) == "
test 2 test
4 5 6
" + + def test_translate_inside_to_html(): given_correct_then_correct()