git.iko.soy/typeable/pandoc
on master help sign in
Org reader/writer: use CUSTOM_ID in properties

The `ID` property is reserved for internal use by Org-mode and should not be used. The `CUSTOM_ID` property is to be used instead, it is converted to the `ID` property for certain export format. The reader and writer erroneously used `ID`. This is corrected by using `CUSTOM_ID` where appropriate.

commitf3d27e4c80a8b33493cfdef9fda8247aaa14c801 authorAlbert Krewinkel <albert@zeitkraut.de> dateSat 21 May 2016, 15:40 (10 years ago) parent446cf6a
4 files changed+38−37
compare with master
unifiedsplit
src/Text/Pandoc/Readers/Org.hs+4−3 src/Text/Pandoc/Writers/Org.hs+2−2 tests/Tests/Readers/Org.hs+1−1 tests/writer.org+31−31
src/Text/Pandoc/Readers/Org.hs+4−3
@@ -626,9 +626,10 @@ propertiesDrawer = try $ do
626626keyValuesToAttr :: [(String, String)] -> Attr
627627keyValuesToAttr kvs =
628628 let
629− id' = fromMaybe mempty . lookup "id" $ kvs
630− cls = fromMaybe mempty . lookup "class" $ kvs
631− kvs' = filter (flip notElem ["id", "class"] . fst) kvs
629+ lowerKvs = map (\(k, v) -> (map toLower k, v)) kvs
630+ id' = fromMaybe mempty . lookup "custom_id" $ lowerKvs
631+ cls = fromMaybe mempty . lookup "class" $ lowerKvs
632+ kvs' = filter (flip notElem ["custom_id", "class"] . fst) lowerKvs
632633 in
633634 (id', words cls, kvs')
634635
src/Text/Pandoc/Writers/Org.hs+2−2
@@ -239,8 +239,8 @@ propertiesDrawer (ident, classes, kv) =
239239 let
240240 drawerStart = text ":PROPERTIES:"
241241 drawerEnd = text ":END:"
242− kv' = if (classes == mempty) then kv else ("class", unwords classes):kv
243− kv'' = if (ident == mempty) then kv' else ("id", ident):kv'
242+ kv' = if (classes == mempty) then kv else ("CLASS", unwords classes):kv
243+ kv'' = if (ident == mempty) then kv' else ("CUSTOM_ID", ident):kv'
244244 properties = vcat $ map kvToOrgProperty kv''
245245 in
246246 drawerStart <> cr <> properties <> cr <> drawerEnd
tests/Tests/Readers/Org.hs+1−1
@@ -600,7 +600,7 @@ tests =
600600 , "Preferences are treated as header attributes" =:
601601 unlines [ "* foo"
602602 , " :PROPERTIES:"
603− , " :id: fubar"
603+ , " :custom_id: fubar"
604604 , " :bar: baz"
605605 , " :END:"
606606 ] =?>
tests/writer.org+31−31
@@ -10,49 +10,49 @@ markdown test suite.
1010
1111* Headers
1212 :PROPERTIES:
13− :id: headers
13+ :CUSTOM_ID: headers
1414 :END:
1515
1616** Level 2 with an [[/url][embedded link]]
1717 :PROPERTIES:
18− :id: level-2-with-an-embedded-link
18+ :CUSTOM_ID: level-2-with-an-embedded-link
1919 :END:
2020
2121*** Level 3 with /emphasis/
2222 :PROPERTIES:
23− :id: level-3-with-emphasis
23+ :CUSTOM_ID: level-3-with-emphasis
2424 :END:
2525
2626**** Level 4
2727 :PROPERTIES:
28− :id: level-4
28+ :CUSTOM_ID: level-4
2929 :END:
3030
3131***** Level 5
3232 :PROPERTIES:
33− :id: level-5
33+ :CUSTOM_ID: level-5
3434 :END:
3535
3636* Level 1
3737 :PROPERTIES:
38− :id: level-1
38+ :CUSTOM_ID: level-1
3939 :END:
4040
4141** Level 2 with /emphasis/
4242 :PROPERTIES:
43− :id: level-2-with-emphasis
43+ :CUSTOM_ID: level-2-with-emphasis
4444 :END:
4545
4646*** Level 3
4747 :PROPERTIES:
48− :id: level-3
48+ :CUSTOM_ID: level-3
4949 :END:
5050
5151with no blank line
5252
5353** Level 2
5454 :PROPERTIES:
55− :id: level-2
55+ :CUSTOM_ID: level-2
5656 :END:
5757
5858with no blank line
@@ -61,7 +61,7 @@ with no blank line
6161
6262* Paragraphs
6363 :PROPERTIES:
64− :id: paragraphs
64+ :CUSTOM_ID: paragraphs
6565 :END:
6666
6767Here's a regular paragraph.
@@ -79,7 +79,7 @@ here.
7979
8080* Block Quotes
8181 :PROPERTIES:
82− :id: block-quotes
82+ :CUSTOM_ID: block-quotes
8383 :END:
8484
8585E-mail style:
@@ -121,7 +121,7 @@ And a following paragraph.
121121
122122* Code Blocks
123123 :PROPERTIES:
124− :id: code-blocks
124+ :CUSTOM_ID: code-blocks
125125 :END:
126126
127127Code:
@@ -148,12 +148,12 @@ And:
148148
149149* Lists
150150 :PROPERTIES:
151− :id: lists
151+ :CUSTOM_ID: lists
152152 :END:
153153
154154** Unordered
155155 :PROPERTIES:
156− :id: unordered
156+ :CUSTOM_ID: unordered
157157 :END:
158158
159159Asterisks tight:
@@ -200,7 +200,7 @@ Minuses loose:
200200
201201** Ordered
202202 :PROPERTIES:
203− :id: ordered
203+ :CUSTOM_ID: ordered
204204 :END:
205205
206206Tight:
@@ -243,7 +243,7 @@ Multiple paragraphs:
243243
244244** Nested
245245 :PROPERTIES:
246− :id: nested
246+ :CUSTOM_ID: nested
247247 :END:
248248
249249- Tab
@@ -277,7 +277,7 @@ Same thing but with paragraphs:
277277
278278** Tabs and spaces
279279 :PROPERTIES:
280− :id: tabs-and-spaces
280+ :CUSTOM_ID: tabs-and-spaces
281281 :END:
282282
283283- this is a list item indented with tabs
@@ -290,7 +290,7 @@ Same thing but with paragraphs:
290290
291291** Fancy list markers
292292 :PROPERTIES:
293− :id: fancy-list-markers
293+ :CUSTOM_ID: fancy-list-markers
294294 :END:
295295
2962962) begins with 2
@@ -331,7 +331,7 @@ B. Williams
331331
332332* Definition Lists
333333 :PROPERTIES:
334− :id: definition-lists
334+ :CUSTOM_ID: definition-lists
335335 :END:
336336
337337Tight using spaces:
@@ -400,7 +400,7 @@ Blank line after term, indented marker, alternate markers:
400400
401401* HTML Blocks
402402 :PROPERTIES:
403− :id: html-blocks
403+ :CUSTOM_ID: html-blocks
404404 :END:
405405
406406Simple block on one line:
@@ -630,7 +630,7 @@ Hr's:
630630
631631* Inline Markup
632632 :PROPERTIES:
633− :id: inline-markup
633+ :CUSTOM_ID: inline-markup
634634 :END:
635635
636636This is /emphasized/, and so /is this/.
@@ -662,7 +662,7 @@ spaces: a\^b c\^d, a~b c~d.
662662
663663* Smart quotes, ellipses, dashes
664664 :PROPERTIES:
665− :id: smart-quotes-ellipses-dashes
665+ :CUSTOM_ID: smart-quotes-ellipses-dashes
666666 :END:
667667
668668"Hello," said the spider. "'Shelob' is my name."
@@ -686,7 +686,7 @@ Ellipses...and...and....
686686
687687* LaTeX
688688 :PROPERTIES:
689− :id: latex
689+ :CUSTOM_ID: latex
690690 :END:
691691
692692- \cite[22-23]{smith.1899}
@@ -719,7 +719,7 @@ Cat & 1 \\ \hline
719719
720720* Special Characters
721721 :PROPERTIES:
722− :id: special-characters
722+ :CUSTOM_ID: special-characters
723723 :END:
724724
725725Here is some unicode:
@@ -776,12 +776,12 @@ Minus: -
776776
777777* Links
778778 :PROPERTIES:
779− :id: links
779+ :CUSTOM_ID: links
780780 :END:
781781
782782** Explicit
783783 :PROPERTIES:
784− :id: explicit
784+ :CUSTOM_ID: explicit
785785 :END:
786786
787787Just a [[/url/][URL]].
@@ -804,7 +804,7 @@ Just a [[/url/][URL]].
804804
805805** Reference
806806 :PROPERTIES:
807− :id: reference
807+ :CUSTOM_ID: reference
808808 :END:
809809
810810Foo [[/url/][bar]].
@@ -835,7 +835,7 @@ Foo [[/url/][biz]].
835835
836836** With ampersands
837837 :PROPERTIES:
838− :id: with-ampersands
838+ :CUSTOM_ID: with-ampersands
839839 :END:
840840
841841Here's a [[http://example.com/?foo=1&bar=2][link with an ampersand in the
@@ -849,7 +849,7 @@ Here's an [[/script?foo=1&bar=2][inline link in pointy braces]].
849849
850850** Autolinks
851851 :PROPERTIES:
852− :id: autolinks
852+ :CUSTOM_ID: autolinks
853853 :END:
854854
855855With an ampersand: [[http://example.com/?foo=1&bar=2]]
@@ -874,7 +874,7 @@ Auto-links should not occur here: =<http://example.com/>=
874874
875875* Images
876876 :PROPERTIES:
877− :id: images
877+ :CUSTOM_ID: images
878878 :END:
879879
880880From "Voyage dans la Lune" by Georges Melies (1902):
@@ -888,7 +888,7 @@ Here is a movie [[movie.jpg]] icon.
888888
889889* Footnotes
890890 :PROPERTIES:
891− :id: footnotes
891+ :CUSTOM_ID: footnotes
892892 :END:
893893
894894Here is a footnote reference, [1] and another. [2] This should /not/ be a