[LyX/master] DocBook fonts: fix issue 1732

Thibaut Cuvelier tcuvelier at lyx.org
Sun Jul 19 18:35:48 UTC 2020


commit 6b701f945e928497abfaf88c39fdff30254bf56c
Author: Thibaut Cuvelier <tcuvelier at lyx.org>
Date:   Sun Jul 19 21:00:25 2020 +0200

    DocBook fonts: fix issue 1732
---
 .../docbook/issue1732_charstyles-docbook.lyx       |  106 ++++++++++++++++++++
 .../docbook/issue1732_charstyles-docbook.xml       |    7 ++
 src/output_docbook.cpp                             |    4 +-
 3 files changed, 115 insertions(+), 2 deletions(-)

diff --git a/autotests/export/docbook/issue1732_charstyles-docbook.lyx b/autotests/export/docbook/issue1732_charstyles-docbook.lyx
new file mode 100644
index 0000000..8a5ece1
--- /dev/null
+++ b/autotests/export/docbook/issue1732_charstyles-docbook.lyx
@@ -0,0 +1,106 @@
+#LyX 2.4 created this file. For more info see https://www.lyx.org/
+\lyxformat 598
+\begin_document
+\begin_header
+\save_transient_properties true
+\origin unavailable
+\textclass article
+\use_default_options false
+\maintain_unincluded_children no
+\language english
+\language_package default
+\inputencoding auto-legacy
+\fontencoding auto
+\font_roman "default" "default"
+\font_sans "default" "default"
+\font_typewriter "default" "default"
+\font_math "auto" "auto"
+\font_default_family default
+\use_non_tex_fonts false
+\font_sc false
+\font_roman_osf false
+\font_sans_osf false
+\font_typewriter_osf false
+\font_sf_scale 100 100
+\font_tt_scale 100 100
+\use_microtype false
+\use_dash_ligatures true
+\graphics default
+\default_output_format default
+\output_sync 0
+\bibtex_command default
+\index_command default
+\float_placement class
+\float_alignment class
+\paperfontsize default
+\spacing single
+\use_hyperref false
+\papersize default
+\use_geometry false
+\use_package amsmath 0
+\use_package amssymb 0
+\use_package cancel 0
+\use_package esint 0
+\use_package mathdots 1
+\use_package mathtools 0
+\use_package mhchem 1
+\use_package stackrel 0
+\use_package stmaryrd 0
+\use_package undertilde 0
+\cite_engine basic
+\cite_engine_type default
+\biblio_style plain
+\use_bibtopic false
+\use_indices false
+\paperorientation portrait
+\suppress_date false
+\justification true
+\use_refstyle 0
+\use_minted 0
+\use_lineno 0
+\index Index
+\shortcut idx
+\color #008000
+\end_index
+\secnumdepth 3
+\tocdepth 3
+\paragraph_separation indent
+\paragraph_indentation default
+\is_math_indent 0
+\math_numbering_side default
+\quotes_style english
+\dynamic_quotes 0
+\papercolumns 1
+\papersides 1
+\paperpagestyle default
+\tablestyle default
+\tracking_changes false
+\output_changes false
+\change_bars false
+\postpone_fragile_content false
+\html_math_output 0
+\html_css_as_file 0
+\html_be_strict false
+\docbook_table_output 0
+\end_header
+
+\begin_body
+
+\begin_layout Standard
+
+\series bold
+Fett 
+\series default
+\emph on
+hervorgehoben
+\emph default
+ 
+\family typewriter
+monospace
+\family default
+\bar under
+ unterstrichen.
+\end_layout
+
+\end_body
+\end_document
diff --git a/autotests/export/docbook/issue1732_charstyles-docbook.xml b/autotests/export/docbook/issue1732_charstyles-docbook.xml
new file mode 100644
index 0000000..0ed9b87
--- /dev/null
+++ b/autotests/export/docbook/issue1732_charstyles-docbook.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This DocBook file was created by LyX 2.4.0dev
+  See http://www.lyx.org/ for more information -->
+<article xml:lang="en_US" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:xi="http://www.w3.org/2001/XInclude" version="5.2">
+<para><emphasis role='bold'>Fett </emphasis><emphasis>hervorgehoben</emphasis> <code>monospace</code><emphasis role='underline'> unterstrichen.</emphasis></para>
+
+</article>
\ No newline at end of file
diff --git a/src/output_docbook.cpp b/src/output_docbook.cpp
index a8ac4ea..d29362e 100644
--- a/src/output_docbook.cpp
+++ b/src/output_docbook.cpp
@@ -104,11 +104,11 @@ string fontToRole(xml::FontTypes type)
 		return ""; // Outputs a <person>
 	case xml::FontTypes::FT_TYPE:
 		return ""; // Outputs a <code>
+	case xml::FontTypes::FT_UBAR:
+		return "underline";
 
 		// All other roles are non-standard for DocBook.
 
-	case xml::FontTypes::FT_UBAR:
-		return "ubar";
 	case xml::FontTypes::FT_WAVE:
 		return "wave";
 	case xml::FontTypes::FT_DBAR:


More information about the lyx-cvs mailing list