Support rich line output in both speech and braille

third_party/liblouis/nacl_wrapper/liblouis_instance.cc

 // Copyright 2013 Google Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License"); you may not
 // use this file except in compliance with the License. You may obtain a copy of
 // the License at
 //
 // http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
@@ skipping 91 matching lines @@
 static const char kTablesDirDefault[] = "tables";
 
 // Well-known strings used in JSON messages.
 static const char kCommandKey[] = "command";
 static const char kMessageIdKey[] = "message_id";
 static const char kInReplyToKey[] = "in_reply_to";
 static const char kErrorKey[] = "error";
 static const char kTableNamesKey[] = "table_names";
 static const char kSuccessKey[] = "success";
 static const char kTextKey[] = "text";
+static const char kFormTypeMapKey[] = "form_type_map";
 static const char kCellsKey[] = "cells";
 static const char kCursorPositionKey[] = "cursor_position";
 static const char kTextToBrailleKey[] = "text_to_braille";
 static const char kBrailleToTextKey[] = "braille_to_text";
 static const char kCheckTableCommand[] = "CheckTable";
 static const char kTranslateCommand[] = "Translate";
 static const char kBackTranslateCommand[] = "BackTranslate";
 
 LibLouisInstance::LibLouisInstance(PP_Instance instance)
     : pp::Instance(instance), liblouis_thread_(this), cc_factory_(this) {}
@@ skipping 108 matching lines @@
   Json::Value reply(Json::objectValue);
   reply[kSuccessKey] = success;
   PostReply(reply, message_id);
 }
 
 void LibLouisInstance::HandleTranslate(const Json::Value& message,
     const std::string& message_id) {
   Json::Value table_names = message[kTableNamesKey];
   Json::Value text = message[kTextKey];
   Json::Value cursor_position = message[kCursorPositionKey];
+  Json::Value form_type_map = message[kFormTypeMapKey];
   if (!table_names.isString()) {
     PostError("expected table_names to be a string", message_id);
     return;
   } else if (!text.isString()) {
     PostError("expected text to be a string", message_id);
     return;
   } else if (!cursor_position.isNull() && !cursor_position.isIntegral()) {
     PostError("expected cursor_position to be null or integral", message_id);
     return;
+  } else if (!form_type_map.isArray()) {
+    PostError("expected form_type_map to be an array", message_id);
+    return;
   }
   TranslationParams params;
   params.table_names = table_names.asString();
   params.text = text.asString();
   params.cursor_position = cursor_position.isIntegral() ?
       cursor_position.asInt() : -1;
+  for (size_t i = 0; i < form_type_map.size(); ++i) {
+    Json::Value val = form_type_map[i];
+    if (!val.isIntegral()) {
+      PostError("expected form_type_map to be an integral array", message_id);
+      return;
+    }
+    params.form_type_map.push_back(val.asInt());
+  }
   PostWorkToBackground(cc_factory_.NewCallback(
       &LibLouisInstance::TranslateInBackground,
       params, message_id));
 }
 
 void LibLouisInstance::TranslateInBackground(int32_t result,
     const TranslationParams& params, const std::string& message_id) {
   if (result != PP_OK) {
     PostError("failed to transfer call to background thread", message_id);
     return;
@@ skipping 51 matching lines @@
   bool success = liblouis_.BackTranslate(table_names, cells, &text);
   Json::Value reply(Json::objectValue);
   reply[kSuccessKey] = success;
   if (success) {
     reply[kTextKey] = text;
   }
   PostReply(reply, message_id);
 }
 
 }  // namespace liblouis_nacl