[LyX master] Add missing option commas

[Juergen Spitzmueller]

The branch, master, has been updated.

- Log -

commit 6dd333b432999026fa9a5a6c9bc00d476dcf07e1
Author: Juergen Spitzmueller sp...@lyx.org
Date:   Sat Aug 18 13:29:14 2012 +0200

Add missing option commas

diff --git a/src/LaTeXFonts.cpp b/src/LaTeXFonts.cpp
index 6f89cd1..b165258 100644
--- a/src/LaTeXFonts.cpp
+++ b/src/LaTeXFonts.cpp
@@ -137,10 +137,15 @@ string const LaTeXFont::getPackageOptions(bool ot1, bool 
sc, bool osf, int scale
os  to_ascii(osfscoption_);
else
os  to_ascii(osfoption_)  ','  
to_ascii(scoption_);
-   } else if (osf  providesOSF())
+   } else if (osf  providesOSF()) {
+   if (!os.str().empty())
+   os  ',';
os  to_ascii(osfoption_);
-   else if (sc  providesSC())
+   } else if (sc  providesSC()) {
+   if (!os.str().empty())
+   os  ',';
os  to_ascii(scoption_);
+   }
if (scale != 100  !scaleoption_.empty()) {
if (!os.str().empty())
os  ',';

---

Summary of changes:
 src/LaTeXFonts.cpp |9 +++--
 1 files changed, 7 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

[LyX master] Add missing option commas

[Juergen Spitzmueller]

The branch, master, has been updated.

- Log -

commit 6dd333b432999026fa9a5a6c9bc00d476dcf07e1
Author: Juergen Spitzmueller 
Date:   Sat Aug 18 13:29:14 2012 +0200

Add missing option commas

diff --git a/src/LaTeXFonts.cpp b/src/LaTeXFonts.cpp
index 6f89cd1..b165258 100644
--- a/src/LaTeXFonts.cpp
+++ b/src/LaTeXFonts.cpp
@@ -137,10 +137,15 @@ string const LaTeXFont::getPackageOptions(bool ot1, bool 
sc, bool osf, int scale
os << to_ascii(osfscoption_);
else
os << to_ascii(osfoption_) << ',' << 
to_ascii(scoption_);
-   } else if (osf && providesOSF())
+   } else if (osf && providesOSF()) {
+   if (!os.str().empty())
+   os << ',';
os << to_ascii(osfoption_);
-   else if (sc && providesSC())
+   } else if (sc && providesSC()) {
+   if (!os.str().empty())
+   os << ',';
os << to_ascii(scoption_);
+   }
if (scale != 100 && !scaleoption_.empty()) {
if (!os.str().empty())
os << ',';

---

Summary of changes:
 src/LaTeXFonts.cpp |9 +++--
 1 files changed, 7 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository