X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FExternalTransforms.cpp;h=4f85f9d479f00c202728b20dc39186dcee5ffb02;hb=e5c79a43ee78192f45a9ab34873f8bb426b5f37e;hp=47625364847c554025e5a0c6ee0979eedcda4a65;hpb=9c55af4a223ce4db29d643251109e245665344bd;p=lyx.git

diff --git a/src/insets/ExternalTransforms.cpp b/src/insets/ExternalTransforms.cpp
index 4762536484..4f85f9d479 100644
--- a/src/insets/ExternalTransforms.cpp
+++ b/src/insets/ExternalTransforms.cpp
@@ -78,7 +78,7 @@ namespace {
 typedef Translator<RotationData::OriginType, string> OriginTranslator;
 OriginTranslator const & originTranslator();
 
-} // namespace anon
+} // namespace
 
 
 void RotationData::origin(string const & o)
@@ -183,7 +183,7 @@ ostream & operator<<(ostream & os, RotationData::OriginType type)
 	return os;
 }
 
-} // namespace anon
+} // namespace
 
 
 string const RotationLatexCommand::front_impl() const
@@ -218,7 +218,10 @@ string const  ClipLatexOption::option_impl() const
 
 	ostringstream os;
 	if (!data.bbox.empty())
-		os << "bb=" << data.bbox << ',';
+		os << "bb=" << data.bbox.xl.asLatexString() << ' '
+		   << data.bbox.yb.asLatexString() << ' '
+		   << data.bbox.xr.asLatexString() << ' '
+		   << data.bbox.yt.asLatexString() << ',';
 	if (data.clip)
 		os << "clip,";
 	return os.str();
@@ -280,10 +283,9 @@ string const sanitizeLatexOption(string const & input)
 	// "[,,,,foo..." -> "foo..." ("foo..." may be empty)
 	string output;
 	lyx::smatch what;
-	static lyx::regex const front("^( *[[],*)(.*)$");
+	static lyx::regex const front("^( *\\[,*)(.*)$");
 
-	regex_match(it, end, what, front);
-	if (!what[0].matched) {
+	if (!regex_match(it, end, what, front)) {
 		lyxerr << "Unable to sanitize LaTeX \"Option\": "
 		       << input << '\n';
 		return string();
@@ -295,8 +297,7 @@ string const sanitizeLatexOption(string const & input)
 	// with iterator now pointing to 'b'
 	static lyx::regex const commas("([^,]*)(,,*)(.*)$");
 	for (; it != end;) {
-		regex_match(it, end, what, commas);
-		if (!what[0].matched) {
+		if (!regex_match(it, end, what, commas)) {
 			output += string(it, end);
 			break;
 		}
@@ -306,9 +307,8 @@ string const sanitizeLatexOption(string const & input)
 
 	// Strip any trailing commas
 	// "...foo,,,]" -> "...foo" ("...foo,,," may be empty)
-	static lyx::regex const back("^(.*[^,])?,*[]] *$");
-	regex_match(output, what, back);
-	if (!what[0].matched) {
+	static lyx::regex const back("^(.*[^,])?,*\\] *$");
+	if (!regex_match(output, what, back)) {
 		lyxerr << "Unable to sanitize LaTeX \"Option\": "
 		       << output << '\n';
 		return string();
@@ -333,11 +333,11 @@ void extractIt(boost::any const & any_factory,
 		return;
 
 	Factory factory = boost::any_cast<Factory>(any_factory);
-	if (!factory.empty())
+	if (factory)
 		transformer = factory(data);
 }
 
-} // namespace anon
+} // namespace
 
 
 TransformCommand::ptr_type
@@ -426,7 +426,7 @@ OriginTranslator const & originTranslator()
 	return translator;
 }
 
-} // namespace anon
+} // namespace
 
 } // namespace external
 } // namespace lyx