OSDN Git Service

Camera2: Docs - Fix tags to be displayed in the docs HTML: DO NOT MERGE
authorIgor Murashkin <iam@google.com>
Wed, 5 Dec 2012 22:49:11 +0000 (14:49 -0800)
committerIgor Murashkin <iam@google.com>
Thu, 31 Jan 2013 00:16:54 +0000 (16:16 -0800)
Change-Id: Id23043f7bb714e4b5c06f46889e1531175ed045f

camera/docs/docs.html
camera/docs/html.mako
camera/docs/metadata_model.py

index 845c9d4..dcd40cd 100644 (file)
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
+                  <li><a href="#tag_AWB">AWB</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
             </td>
 
             <td class="entry_tags">
+              <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
+              </ul>
             </td>
 
           </tr> <!-- end of entry -->
             </td>
 
             <td class="entry_tags">
+              <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
+              </ul>
             </td>
 
           </tr> <!-- end of entry -->
             </td>
 
             <td class="entry_tags">
+              <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
+              </ul>
             </td>
 
           </tr> <!-- end of entry -->
             </td>
 
             <td class="entry_tags">
+              <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
+                  <li><a href="#tag_AWB">AWB</a></li>
+              </ul>
             </td>
 
           </tr> <!-- end of entry -->
             </td>
 
             <td class="entry_tags">
+              <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
+              </ul>
             </td>
 
           </tr> <!-- end of entry -->
             </td>
 
             <td class="entry_tags">
+              <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
+              </ul>
             </td>
 
           </tr> <!-- end of entry -->
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_ADV">ADV</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_ADV">ADV</a></li>
               </ul>
             </td>
 
             </td>
 
             <td class="entry_tags">
+              <ul class="entry_tags">
+                  <li><a href="#tag_V1">V1</a></li>
+              </ul>
             </td>
 
           </tr> <!-- end of entry -->
             </td>
 
             <td class="entry_tags">
+              <ul class="entry_tags">
+                  <li><a href="#tag_V1">V1</a></li>
+              </ul>
             </td>
 
           </tr> <!-- end of entry -->
             </td>
 
             <td class="entry_tags">
+              <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
+              </ul>
             </td>
 
           </tr> <!-- end of entry -->
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_ADV">ADV</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_ADV">ADV</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
             </td>
 
             <td class="entry_tags">
+              <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
+              </ul>
             </td>
 
           </tr> <!-- end of entry -->
             </td>
 
             <td class="entry_tags">
+              <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
+              </ul>
             </td>
 
           </tr> <!-- end of entry -->
             </td>
 
             <td class="entry_tags">
+              <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
+              </ul>
             </td>
 
           </tr> <!-- end of entry -->
             </td>
 
             <td class="entry_tags">
+              <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
+              </ul>
             </td>
 
           </tr> <!-- end of entry -->
             </td>
 
             <td class="entry_tags">
+              <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
+              </ul>
             </td>
 
           </tr> <!-- end of entry -->
             </td>
 
             <td class="entry_tags">
+              <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
+              </ul>
             </td>
 
           </tr> <!-- end of entry -->
             </td>
 
             <td class="entry_tags">
+              <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
+              </ul>
             </td>
 
           </tr> <!-- end of entry -->
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
+                  <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
+                  <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_DNG">DNG</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_DNG">DNG</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_ADV">ADV</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
             </td>
 
             <td class="entry_tags">
+              <ul class="entry_tags">
+                  <li><a href="#tag_V1">V1</a></li>
+              </ul>
             </td>
 
           </tr> <!-- end of entry -->
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
             </td>
 
             <td class="entry_tags">
+              <ul class="entry_tags">
+                  <li><a href="#tag_V1">V1</a></li>
+              </ul>
             </td>
 
           </tr> <!-- end of entry -->
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
             </td>
 
             <td class="entry_tags">
+              <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
+              </ul>
             </td>
 
           </tr> <!-- end of entry -->
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_V1">V1</a></li>
+                  <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_DNG">DNG</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
+                  <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_DNG">DNG</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
+                  <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_V1">V1</a></li>
+                  <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_DNG">DNG</a></li>
+                  <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_DNG">DNG</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_DNG">DNG</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_DNG">DNG</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_DNG">DNG</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_DNG">DNG</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_DNG">DNG</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_DNG">DNG</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_DNG">DNG</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_DNG">DNG</a></li>
+                  <li><a href="#tag_EXIF">EXIF</a></li>
               </ul>
             </td>
 
             </td>
 
             <td class="entry_tags">
+              <ul class="entry_tags">
+                  <li><a href="#tag_V1">V1</a></li>
+              </ul>
             </td>
 
           </tr> <!-- end of entry -->
             </td>
 
             <td class="entry_tags">
+              <ul class="entry_tags">
+                  <li><a href="#tag_V1">V1</a></li>
+                  <li><a href="#tag_BC">BC</a></li>
+              </ul>
             </td>
 
           </tr> <!-- end of entry -->
             </td>
 
             <td class="entry_tags">
+              <ul class="entry_tags">
+                  <li><a href="#tag_V1">V1</a></li>
+              </ul>
             </td>
 
           </tr> <!-- end of entry -->
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_ADV">ADV</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
             </td>
 
             <td class="entry_tags">
+              <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
+              </ul>
             </td>
 
           </tr> <!-- end of entry -->
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
             </td>
 
             <td class="entry_tags">
+              <ul class="entry_tags">
+                  <li><a href="#tag_V1">V1</a></li>
+              </ul>
             </td>
 
           </tr> <!-- end of entry -->
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
             </td>
 
             <td class="entry_tags">
+              <ul class="entry_tags">
+                  <li><a href="#tag_V1">V1</a></li>
+              </ul>
             </td>
 
           </tr> <!-- end of entry -->
 
             <td class="entry_tags">
               <ul class="entry_tags">
+                  <li><a href="#tag_DNG">DNG</a></li>
               </ul>
             </td>
 
             </td>
 
             <td class="entry_tags">
+              <ul class="entry_tags">
+                  <li><a href="#tag_DNG">DNG</a></li>
+              </ul>
             </td>
 
           </tr> <!-- end of entry -->
index d647f90..0baf181 100644 (file)
             </td>
 
             <td class="entry_tags">
-            % if list(prop.tags):
+            % if next(prop.tags, None):
               <ul class="entry_tags">
               % for tag in prop.tags:
                   <li><a href="#tag_${tag.id}">${tag.id}</a></li>
index 2091698..c1f4e09 100644 (file)
@@ -1154,22 +1154,23 @@ class MergedEntry(Entry):
     props_distinct = ['description', 'units', 'range', 'notes', 'tags', 'kind']
 
     for p in props_distinct:
+      p = '_' + p
       if entry.is_clone():
-        setattr(self, '_' + p, getattr(entry, p) or getattr(entry.entry, p))
+        setattr(self, p, getattr(entry, p) or getattr(entry.entry, p))
       else:
-        setattr(self, '_' + p, getattr(entry, p))
+        setattr(self, p, getattr(entry, p))
 
-    props_common = ['parent', 'name', 'name_short', 'container',
+    props_common = ['parent', 'name', 'container',
                     'container_sizes', 'enum',
                     'tuple_values',
                     'type',
                     'type_notes',
-                    'enum'
                    ]
 
     for p in props_common:
+      p = '_' + p
       if entry.is_clone():
-        setattr(self, '_' + p, getattr(entry.entry, p))
+        setattr(self, p, getattr(entry.entry, p))
       else:
-        setattr(self, '_' + p, getattr(entry, p))
+        setattr(self, p, getattr(entry, p))