[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:44:59 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=1a5e6b6
The following commit has been merged in the master branch:
commit 1a5e6b6c6ee7f77e10687d0f04a3564c3536cfc1
Author: asp <alan.pater at gmail.com>
Date: Fri Apr 3 15:58:56 2015 +0000
#784 doc template for lr schema
---
doc/templates/Makefile | 1 +
doc/templates/__index2__ | 1 +
doc/templates/tags-xmp-lr.html.in | 27 +++++++++++++++++++++++++++
src/properties.cpp | 4 ++--
4 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/doc/templates/Makefile b/doc/templates/Makefile
index 1356227..07ea9d6 100644
--- a/doc/templates/Makefile
+++ b/doc/templates/Makefile
@@ -121,6 +121,7 @@ SCHEMA = xmp_dc \
xmp_xmpDM \
xmp_pdf \
xmp_photoshop \
+ xmp_lr \
xmp_crs \
xmp_tiff \
xmp_exif \
diff --git a/doc/templates/__index2__ b/doc/templates/__index2__
index 07d46f9..923bcc8 100644
--- a/doc/templates/__index2__
+++ b/doc/templates/__index2__
@@ -32,6 +32,7 @@
<li><a href="tags-xmp-xmpDM.html"><span>xmpDM</span></a></li>
<li><a href="tags-xmp-pdf.html"><span>pdf</span></a></li>
<li><a href="tags-xmp-photoshop.html"><span>photoshop</span></a></li>
+ <li><a href="tags-xmp-lr.html"><span>lr</span></a></li>
<li><a href="tags-xmp-crs.html"><span>crs</span></a></li>
<li><a href="tags-xmp-tiff.html"><span>tiff</span></a></li>
<li><a href="tags-xmp-exif.html"><span>exif</span></a></li>
diff --git a/doc/templates/tags-xmp-lr.html.in b/doc/templates/tags-xmp-lr.html.in
new file mode 100644
index 0000000..3010d78
--- /dev/null
+++ b/doc/templates/tags-xmp-lr.html.in
@@ -0,0 +1,27 @@
+__doctype__
+<html>
+__header2__
+<body>
+
+<div id="content">
+__index1__
+__index2__
+
+<h2>Lightroom Schema</h2>
+<p>This schema specifies hierarchical keyword XMP properties used by Adobe Lightroom.
+ <ul>
+ <li>Exiv2 keys are <b><code>Xmp.lr.<Property></code></b></li>
+ <li>The schema namespace URI is <b><code>http://ns.adobe.com/lightroom/1.0/</code></b></li>
+ <li>The preferred schema namespace prefix is <b><code>lr</code></b></li>
+ </ul>
+Reference: <a href="https://helpx.adobe.com/lightroom/help/keywords.html" title="Adobe Lightroom Keywords">Adobe Lightroom Keywords</a>
+</p>
+<p>Click on a column header to sort the table.</p>
+
+__xmp_lr__
+
+</div>
+<!-- closes content -->
+
+</body>
+</html>
diff --git a/src/properties.cpp b/src/properties.cpp
index 1663743..70178bb 100644
--- a/src/properties.cpp
+++ b/src/properties.cpp
@@ -114,7 +114,7 @@ namespace Exiv2 {
{ "http://ns.adobe.com/xap/1.0/t/pg/", "xmpTPg", xmpXmpTPgInfo, N_("XMP Paged-Text schema") },
{ "http://ns.adobe.com/xmp/1.0/DynamicMedia/", "xmpDM", xmpXmpDMInfo, N_("XMP Dynamic Media schema") },
{ "http://ns.microsoft.com/photo/1.0/", "MicrosoftPhoto", xmpMicrosoftInfo, N_("Microsoft Photo schema") },
- { "http://ns.adobe.com/lightroom/1.0/", "lr", xmpLrInfo, N_("Adobe LightRoom schema") },
+ { "http://ns.adobe.com/lightroom/1.0/", "lr", xmpLrInfo, N_("Adobe Lightroom schema") },
{ "http://ns.adobe.com/pdf/1.3/", "pdf", xmpPdfInfo, N_("Adobe PDF schema") },
{ "http://ns.adobe.com/photoshop/1.0/", "photoshop", xmpPhotoshopInfo, N_("Adobe photoshop schema") },
{ "http://ns.adobe.com/camera-raw-settings/1.0/", "crs", xmpCrsInfo, N_("Camera Raw schema") },
@@ -1144,7 +1144,7 @@ namespace Exiv2 {
{ "GPSTimeStamp", N_("GPS Time Stamp"), "Date", xmpText, xmpInternal, N_("Time stamp of GPS data, ") },
{ "GPSVersionID", N_("GPS Version ID"), "Text", xmpText, xmpInternal, N_("A decimal encoding with period separators. ") },
{ "GraphicsMode", N_("Graphcs Mode"), "Text", xmpText, xmpExternal, N_("A 16-bit integer that specifies the transfer mode. The transfer mode specifies which Boolean"
- "operation QuickDraw should performwhen drawing ortransferring an image fromone location to another.") },
+ "operation QuickDraw should perform when drawing or transferring an image from one location to another.") },
{ "Grouping", N_("Grouping"), "Text", xmpText, xmpExternal, N_("Information about the Grouping.") },
{ "HandlerClass", N_("Handler Class"), "Text", xmpText, xmpExternal, N_("A four-character code that identifies the type of the handler. Only two values are valid for this field: 'mhlr' for media handlers and 'dhlr' for data handlers.") },
{ "HandlerDescription", N_("Handler Description"), "Text", xmpText, xmpExternal, N_("A (counted) string that specifies the name of the component-that is, the media handler used when this media was created..") },
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list