OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub
Ruby agile-developmentangularbcfboardsbug-trackerganttgantt-chartifcissue-trackerjira-alternativekanbanopenprojectproduct-managementproject-managementproject-planningroadmaprubyscrumtimelineworkflows
md-to-pdf: pdf.formatted_text needs the style as second parameter to apply "leading" settings (sort of line height in prawn pdf)
as-opbccf118c78e1
diff --git a/app/models/exports/pdf/components/page.rb b/app/models/exports/pdf/components/page.rbindex 7ed20554a19..04b6f632911 100644--- a/app/models/exports/pdf/components/page.rb+++ b/app/models/exports/pdf/components/page.rb@@ -73,7 +73,8 @@ module Exports::PDF::Components::Pagedef write_title!pdf.title = headingwith_margin(styles.page_heading_margins) do- pdf.formatted_text([styles.page_heading.merge({ text: heading })])+ style = styles.page_heading+ pdf.formatted_text([style.merge({ text: heading })], style)endenddiff --git a/app/models/exports/pdf/components/wp_table.rb b/app/models/exports/pdf/components/wp_table.rbindex c2c16c7de89..193b539599c 100644--- a/app/models/exports/pdf/components/wp_table.rb+++ b/app/models/exports/pdf/components/wp_table.rb@@ -147,7 +147,8 @@ module Exports::PDF::Components::WpTablewrite_optional_page_breakwith_margin(styles.wp_table_margins) dowith_margin(styles.wp_table_group_header_margins) do- pdf.formatted_text([styles.wp_table_group_header.merge({ text: make_group_label(group) })])+ style = styles.wp_table_group_header+ pdf.formatted_text([style.merge({ text: make_group_label(group) })], style)endwrite_table!(work_packages, query, columns, sums)enddiff --git a/app/models/work_package/pdf_export/common/markdown_field.rb b/app/models/work_package/pdf_export/common/markdown_field.rbindex 45ec73675d8..da289597799 100644--- a/app/models/work_package/pdf_export/common/markdown_field.rb+++ b/app/models/work_package/pdf_export/common/markdown_field.rb@@ -43,8 +43,9 @@ module WorkPackage::PDFExport::Common::MarkdownFieldprivatedef write_markdown_field_label(label)+ style = styles.markdown_field_labelwith_margin(styles.markdown_field_label_margins) do- pdf.formatted_text([styles.markdown_field_label.merge({ text: label })])+ pdf.formatted_text([style.merge({ text: label })], style)endenddiff --git a/app/models/work_package/pdf_export/report/detail.rb b/app/models/work_package/pdf_export/report/detail.rbindex 90d9d728d0f..f37bfa2b207 100644--- a/app/models/work_package/pdf_export/report/detail.rb+++ b/app/models/work_package/pdf_export/report/detail.rb@@ -63,7 +63,7 @@ module WorkPackage::PDFExport::Report::Detaillevel_string_width = write_work_package_level!(level_path, text_style)title = get_column_value work_package, :subjectpdf.indent(level_string_width) do- pdf.formatted_text([text_style.merge({ text: title })])+ pdf.formatted_text([text_style.merge({ text: title })], text_style)endendend@@ -73,7 +73,7 @@ module WorkPackage::PDFExport::Report::Detaillevel_string = "#{level_path.join('.')}. "level_string_width = measure_text_width(level_string, text_style)- pdf.float { pdf.formatted_text([text_style.merge({ text: level_string })]) }+ pdf.float { pdf.formatted_text([text_style.merge({ text: level_string })], text_style) }level_string_widthenddiff --git a/app/models/work_package/pdf_export/report/sums_table.rb b/app/models/work_package/pdf_export/report/sums_table.rbindex 031e5b34faa..c3e89a222de 100644--- a/app/models/work_package/pdf_export/report/sums_table.rb+++ b/app/models/work_package/pdf_export/report/sums_table.rb@@ -46,8 +46,9 @@ module WorkPackage::PDFExport::Report::SumsTableenddef write_sums_title+ style = styles.page_headingwith_margin(styles.page_heading_margins) do- pdf.formatted_text([styles.page_heading.merge({ text: I18n.t("js.work_packages.tabs.overview") })])+ pdf.formatted_text([style.merge({ text: I18n.t("js.work_packages.tabs.overview") })], style)endenddiff --git a/app/models/work_package/pdf_export/report/table_of_contents.rb b/app/models/work_package/pdf_export/report/table_of_contents.rbindex 335741a2eef..5c0ad674d7e 100644--- a/app/models/work_package/pdf_export/report/table_of_contents.rb+++ b/app/models/work_package/pdf_export/report/table_of_contents.rb@@ -83,7 +83,7 @@ module WorkPackage::PDFExport::Report::TableOfContentsdef write_toc_item_subject!(toc_item, indent, subject_style)pdf.indent(indent, toc_item[:page_nr_string_width]) do- pdf.formatted_text([subject_style.merge({ text: toc_item[:title] })])+ pdf.formatted_text([subject_style.merge({ text: toc_item[:title] })], subject_style)endenddiff --git a/app/models/work_package/pdf_export/work_package_to_pdf.rb b/app/models/work_package/pdf_export/work_package_to_pdf.rbindex 20efd3a4649..187760036ce 100644--- a/app/models/work_package/pdf_export/work_package_to_pdf.rb+++ b/app/models/work_package/pdf_export/work_package_to_pdf.rb@@ -96,7 +96,7 @@ class WorkPackage::PDFExport::WorkPackageToPdf < Exports::Exporter{ text: " " },prawn_badge(badge_text, wp_status_prawn_color(work_package), offset:)],- { draw_text_callback: prawn_badge_draw_text_callback(badge_text, offset) }+ styles.page_heading.merge({ draw_text_callback: prawn_badge_draw_text_callback(badge_text, offset) }))endenddiff --git a/app/models/work_package/pdf_export/wp/attributes.rb b/app/models/work_package/pdf_export/wp/attributes.rbindex 20e5e337d14..620ea3016ad 100644--- a/app/models/work_package/pdf_export/wp/attributes.rb+++ b/app/models/work_package/pdf_export/wp/attributes.rb@@ -58,8 +58,9 @@ module WorkPackage::PDFExport::Wp::Attributesenddef write_long_text_custom_field_label(label)+ style = styles.wp_attributes_table_labelwith_margin(styles.markdown_field_label_margins) do- pdf.formatted_text([styles.wp_attributes_table_label.merge({ text: label })])+ pdf.formatted_text([style.merge({ text: label })], style)endend@@ -77,14 +78,16 @@ module WorkPackage::PDFExport::Wp::Attributesenddef write_inline_hint(text)+ style = styles.inline_hintwith_margin(styles.wp_table_margins) do- pdf.formatted_text([styles.inline_hint.merge({ text: })])+ pdf.formatted_text([style.merge({ text: })], style)endenddef write_inline_error(text)+ style = styles.inline_errorwith_margin(styles.markdown_field_label_margins) do- pdf.formatted_text([styles.inline_error.merge({ text: })])+ pdf.formatted_text([style.merge({ text: })], style)endend@@ -176,8 +179,8 @@ module WorkPackage::PDFExport::Wp::Attributesdef write_group_title(group, with_hr: true)write_optional_page_breakwith_margin(styles.wp_attributes_group_label_margins) do- pdf.formatted_text([styles.wp_attributes_group_label- .merge({ text: group.translated_key })])+ style = styles.wp_attributes_group_label+ pdf.formatted_text([style.merge({ text: group.translated_key })], style)write_group_title_hr if with_hrendenddiff --git a/spec/models/work_packages/pdf_export/work_package_to_pdf_spec.rb b/spec/models/work_packages/pdf_export/work_package_to_pdf_spec.rbindex 5218a1753c0..3ca90214a50 100644--- a/spec/models/work_packages/pdf_export/work_package_to_pdf_spec.rb+++ b/spec/models/work_packages/pdf_export/work_package_to_pdf_spec.rb@@ -471,6 +471,8 @@ RSpec.describe WorkPackage::PDFExport::WorkPackageToPdf do[*expected_details,label_title(:description),+ "1", export_date_formatted, project.name,+"Project attributes and labels",supported_project_embeds.map do |embed|[Project.human_attribute_name(@@ -478,9 +480,6 @@ RSpec.describe WorkPackage::PDFExport::WorkPackageToPdf do), embed[1]]end,"Custom field boolean", I18n.t(:general_text_Yes),-- "1", export_date_formatted, project.name,-"Custom field rich text", "[#{I18n.t('export.macro.rich_text_unsupported')}]","Custom field hidden","No replacement of:",