diff --git a/AUTHORS.md b/AUTHORS.md --- a/AUTHORS.md +++ b/AUTHORS.md @@ -187,6 +187,7 @@ - Jeff Runningen - Jens Getreu - Jens Petersen +- Jens Oehlschlägel - Jesse Hathaway - Jeremie Knuesel - Jérémy Bobbio @@ -355,6 +356,7 @@ - Stephan Daus - Stephan Meijer - Stephen Altamirano +- Stephen Huan - Sukil Etxenike - Sukka - Sumit Sahrawat diff --git a/MANUAL.txt b/MANUAL.txt --- a/MANUAL.txt +++ b/MANUAL.txt @@ -1,7 +1,7 @@ --- title: Pandoc User's Guide author: John MacFarlane -date: June 24, 2024 +date: July 28, 2024 --- # Synopsis @@ -1016,6 +1016,11 @@ SVG in a document, as `` elements will be used to reduce duplication. +`--link-images[=true|false]` + +: Include links to images instead of embedding the images in ODT. + (This option currently only affects ODT output.) + `--html-q-tags[=true|false]` : Use `` tags for quotes in HTML. (This option only has an @@ -1077,7 +1082,7 @@ headings to become `\part{..}`, while second-level headings remain as their default type. -`-N`, `--number-sections` +`-N`, `--number-sections=[true|false]` : Number section headings in LaTeX, ConTeXt, HTML, Docx, ms, or EPUB output. By default, sections are not numbered. Sections with class @@ -3675,7 +3680,7 @@ when you are targeting `ipynb` or a Markdown-based output format. -#### Extension: `citations` {#org-citations} +### Extension: `citations` (org) {#org-citations} When the `citations` extension is enabled in `org`, org-cite and org-ref style citations will be parsed as @@ -3684,12 +3689,14 @@ [org-cite]: https://orgmode.org/manual/Citations.html [org-ref]: https://github.com/jkitchin/org-ref +### Extension: `citations` (docx) {#docx-citations} + When `citations` is enabled in `docx`, citations inserted by Zotero or Mendeley or EndNote plugins will be parsed as native pandoc citations. (Otherwise, the formatted citations generated by the bibliographic software will be parsed as regular text.) -#### Extension: `fancy_lists` {#org-fancy-lists} +### Extension: `fancy_lists` (org) {#org-fancy-lists} Some aspects of [Pandoc's Markdown fancy lists](#extension-fancy_lists) are also accepted in `org` input, mimicking the option `org-list-allow-alphabetical` in @@ -7535,7 +7542,7 @@ # Authors -Copyright 2006--2022 John MacFarlane (jgm@berkeley.edu). Released +Copyright 2006--2024 John MacFarlane (jgm@berkeley.edu). Released under the [GPL], version 2 or greater. This software carries no warranty of any kind. (See COPYRIGHT for full copyright and warranty notices.) For a full list of contributors, see the file diff --git a/changelog.md b/changelog.md --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,109 @@ # Revision history for pandoc +## pandoc 3.3 (2024-07-28) + + * New cli option: `--link-images`. This causes images to be linked + rather than embedded in ODT. + + * Allow `--number-sections` to take an optional `true|false` argument. + + * RTF reader: + + + Handle `\*\shppict` without dropping image (#10025). + + * TWiki Reader: + + + Recognize WikiWords as internal links (#9941). + + Avoid partial function. + + * Typst reader: + + + Ignore 'pad' and just parse its body (#9958). + + Use typst 0.5.0.5. Fixes parsing of equations like `$1.$`. + + * Docx writer: + + + Fix regression with nested lists (#9994). The bug affects e.g. + ordered lists with bullet sublists; after the sublist the top-level + list reverts to bullets instead of being properly numbered. + This is a regression introduced in version 3.2.1. + + * BibTeX writer: + + + Ensure that "literal" names are enclosed in braces (#9987). + + * Man writer: + + + Use default middle header when metadata does not include `header` + (#9943). This change causes pandoc to omit the middle + header parameter when `header` is not set, rather than + emitting `""`. The parameter is optional and man will use + a default based on the section if it is not specified. + + * HTML templates: don't load polyfill (#9918). + This was added in a period when MathJaX required polyfill. + MathJaX no longer recommends this and polyfill should no + longer be necessary on any reasonably modern browser. + + * Translations: + + + Add `ua.yaml` (Jens Oehlschlägel). + + Add a script (`tools/update-translations.py`) and Makefile + target (`update-translations`) to update translation data + automatically from babel and polyglossia upstream + (Stephen Huan). + + Use this script to update language data, increasing the number + of languages we cover (Stephen Huan). Fix a few small bugs in + existing translations. + + * Fix some mistakes with Japanese language code (#9938). + In several places we were mistakenly assuming that the BCP 47 code for + Japanese language was `jp`. It is `ja`. + + * Text.Pandoc.Options: + + + New field in WriterOptions: `writerLinkImages` [API change] (#9815). + + * Text.Pandoc.App.Opt: + + + New field in Opt: `optLinkImages` [API change] (#9815). + + * Lua subsystem: + + + Keep `lpeg` and `re` as "loaded" modules (Albert Krewinkel). + The modules `lpeg` and `re` are now treated as if they had been + loaded with `require`. Previously the modules were only assigned + to global values, but could be loaded again via `require`, + thereby allowing to use a system-wide installation. However, this + proved to be confusing. + + The old behavior can be restored by adding the following lines to + the top of Lua scripts, or to the `init.lua` in the data dir. + + debug.registry()['_LOADED'].lpeg = nil + debug.registry()['_LOADED'].re = nil + + * `pandoc-cli`: Include pandoc copyright in Lua version info (Albert + Krewinkel). + + * `pandoc-cli`: Refer printing of version info to the Lua interpreter + (Albert Krewinkel). The Lua interpreter no longer terminates when + called with `-v` or `--version` arguments, thus improving + compatibility with the default `lua` interpreter program. + + * Avoid partial functions in JATS reader, DocBook writer, Haddock reader. + + * Allow tls 2.1.x. + + * MANUAL.txt: + + + Make documentation of extensions clearer (#9060). + + Fix section level for two Extensions entries. + + * lua-filters.md: Partially autogenerate docs for module `pandoc` + (Albert Krewinkel). The documentation system isn't powerful enough to + generate the full documentation automatically. + ## pandoc 3.2.1 (2024-06-24) * Fix `gfm_auto_identifiers` to replace emojis with their aliases, @@ -55,20 +159,6 @@ + Don't let spans begin right after a symbol (#9878). - * Texinfo writer: - - + Ensure proper escaping in all node/link contexts. - + Target node rather than anchor when possible in internal links. - + Remove illegal characters from internal link anchors (#6177). - + Use two commas not one in `@ref`. - + Don't add anchors to headings. We don't need them, now that we - make internal links use the node. - + Avoid duplicate node names. - + Improve menus. Properly handle the case where the node name is - different from the descriptive title. - - * Texinfo template: add variables for filename and version. - * Typst reader: + Fix an incomplete pattern match (#9807). @@ -83,21 +173,6 @@ * Docx writer: - + Omit `jc` attribute on table cells with AlignDefault (#5662). - + Better formatting for task lists. Task lists are now properly - formatted, with no bullet (#5198). - + Replace an expensive generic traverse to remove Space elements, - for better performance. - + The new OpenXML template had spaces for metadata that need - to be filled with OpenXML fragments with the proper shape. - This patch ensures that everything is the right shape. - + Wrap figures with `id` in a bookmark (#8662). - + Add eastAsia font hints to `w:r` (#9817). We do this when the text - in the run contains any CJK characters. This ensures that ambiguous - code points (e.g. quotation marks) will be represented as "wide" - characters when together with CJK characters. - + Clean up Abstract Title and Subtitle in default reference docx. - Center Subtitle, remove color. + Allow OpenXML templates to be used with `docx` (#8338, #9069, #7256, #2928). The `--reference-doc` option allows customization of styles in docx output, but it does not allow one to adjust the content of the output @@ -110,19 +185,29 @@ The included files must be OpenXML fragments suitable for inclusion in the document body. + New unexported module Text.Pandoc.Writers.Docx.OpenXML. + + Omit `jc` attribute on table cells with AlignDefault (#5662). + + Better formatting for task lists. Task lists are now properly + formatted, with no bullet (#5198). + + Replace an expensive generic traverse to remove Space elements, + for better performance. + + Wrap figures with `id` in a bookmark (#8662). + + Add eastAsia font hints to `w:r` (#9817). We do this when the text + in the run contains any CJK characters. This ensures that ambiguous + code points (e.g. quotation marks) will be represented as "wide" + characters when together with CJK characters. + + Clean up Abstract Title and Subtitle in default reference docx. + Center Subtitle, remove color. * HTML writer: + Ensure URI escaping needed for `html4` (#9905). Unicode characters need not be escaped for html5, and still won't be. - + Don't emit unnecessary classes in HTML tables (#9325, Thomas Soeiro). Pandoc used to emit a `header` class on the `tr` element that forms the table header. This is no longer needed, because `head > tr` will do the same thing. Similarly, pandoc used to emit `even` and `odd` classes on `tr`s, allowing striped styling. This is no longer needed, because one can use e.g. `tbody tr:nth-child(2n)`. - Compatibility warning: users who relied on these classes to style tables may need to adjust their CSS. @@ -180,6 +265,20 @@ + Don't print extra caption when using `implicit_figures`. + Ensure blank line after HTML blocks in commonmark-based formats (#9792). + Fix bug rendering block quotes in lists (#9908). + + * Texinfo writer: + + + Ensure proper escaping in all node/link contexts. + + Target node rather than anchor when possible in internal links. + + Remove illegal characters from internal link anchors (#6177). + + Use two commas not one in `@ref`. + + Don't add anchors to headings. We don't need them, now that we + make internal links use the node. + + Avoid duplicate node names. + + Improve menus. Properly handle the case where the node name is + different from the descriptive title. + + * Texinfo template: add variables for filename and version. * Typst writer: diff --git a/data/templates/default.html4 b/data/templates/default.html4 --- a/data/templates/default.html4 +++ b/data/templates/default.html4 @@ -27,9 +27,6 @@ $header-includes$ $endfor$ $if(math)$ -$if(mathjax)$ - -$endif$ $math$ $endif$ diff --git a/data/templates/default.html5 b/data/templates/default.html5 --- a/data/templates/default.html5 +++ b/data/templates/default.html5 @@ -27,9 +27,6 @@ $header-includes$ $endfor$ $if(math)$ -$if(mathjax)$ - -$endif$ $math$ $endif$ diff --git a/data/templates/default.man b/data/templates/default.man --- a/data/templates/default.man +++ b/data/templates/default.man @@ -8,7 +8,7 @@ $if(adjusting)$ .ad $adjusting$ $endif$ -.TH "$title/nowrap$" "$section/nowrap$" "$date/nowrap$" "$footer/nowrap$" "$header/nowrap$" +.TH "$title/nowrap$" "$section/nowrap$" "$date/nowrap$" "$footer/nowrap$"$if(header)$ "$header/nowrap$"$endif$ $for(header-includes)$ $header-includes$ $endfor$ diff --git a/data/translations/af.yaml b/data/translations/af.yaml new file mode 100644 --- /dev/null +++ b/data/translations/af.yaml @@ -0,0 +1,20 @@ +Abstract: Samevatting +Appendix: Bylae +Bibliography: Bibliografie +Cc: a.a. +Chapter: Hoofstuk +Contents: Inhoudsopgawe +Encl: Bylae(n) +Figure: Figuur +Index: Inhoud +ListOfFigures: Lys van figure +ListOfTables: Lys van tabelle +Page: Bladsy +Part: Deel +Preface: Voorwoord +Proof: Bewys +References: Verwysings +See: sien +SeeAlso: sien ook +Table: Tabel +To: Aan diff --git a/data/translations/alt.yaml b/data/translations/alt.yaml new file mode 100644 --- /dev/null +++ b/data/translations/alt.yaml @@ -0,0 +1,5 @@ +Chapter: Бажалык +Contents: Бажалыктар +Figure: Јурук +Glossary: Сӧзлик +Preface: Сӧс бажы diff --git a/data/translations/ar.yaml b/data/translations/ar.yaml --- a/data/translations/ar.yaml +++ b/data/translations/ar.yaml @@ -1,20 +1,21 @@ -Preface: ﻡﺪﺨﻟ -References: ﺎﻠﻣﺭﺎﺠﻋ -Abstract: ﻢﻠﺨﺻ -Bibliography: ﺎﻠﻤﺻﺍﺩﺭ -Chapter: ﺏﺎﺑ -Appendix: ﺎﻠﻣﻼﺤﻗ -Contents: ﺎﻠﻤﺤﺗﻮﻳﺎﺗ -ListOfFigures: ﻕﺎﺌﻣﺓ ﺍﻸﺸﻛﺎﻟ -ListOfTables: ﻕﺎﺌﻣﺓ ﺎﻠﺟﺩﺍﻮﻟ -Index: ﺎﻠﻔﻫﺮﺳ -Figure: ﺶﻜﻟ -Table: ﺝﺩﻮﻟ -Part: ﺎﻠﻘﺴﻣ -Encl: ﺎﻠﻣﺮﻔﻗﺎﺗ -To: ﺈﻟﻯ -Page: ﺺﻔﺣﺓ -See: ﺭﺎﺠﻋ -SeeAlso: ﺭﺎﺠﻋ ﺄﻴﺿًﺍ -Proof: ﺏﺮﻫﺎﻧ -Glossary: ﻕﺎﻣﻮﺳ +Abstract: ملخص +Appendix: الملاحق +Bibliography: المصادر +Cc: نسخة ل‬ +Chapter: باب +Contents: المحتويات +Encl: المرفقات +Figure: شكل +Glossary: قاموس +Index: الفهرس +ListOfFigures: قائمة الأشكال +ListOfTables: قائمة الجداول +Page: صفحة +Part: القسم +Preface: مدخل +Proof: برهان +References: المراجع +See: راجع +SeeAlso: راجع أيضًا +Table: جدول +To: إلى diff --git a/data/translations/as.yaml b/data/translations/as.yaml new file mode 100644 --- /dev/null +++ b/data/translations/as.yaml @@ -0,0 +1,21 @@ +Abstract: মূলভাৱ +Appendix: পৰিশিষ্ট +Bibliography: তথ্যসূত্ৰ +Cc: প্ৰতিলিপি +Chapter: অধ্যায় +Contents: সমল +Encl: সংযোজিত +Figure: চিত্ৰ +Glossary: অৰ্থকোষ +Index: বিষয়সূচী +ListOfFigures: চিত্ৰসূচী +ListOfTables: তালিকাসূচী +Page: পৃষ্ঠা +Part: অংশ +Preface: পাতনি +Proof: প্ৰমাণ +References: প্ৰসংগ +See: চাওক +SeeAlso: ও +Table: তালিকা +To: মুখে diff --git a/data/translations/ast.yaml b/data/translations/ast.yaml new file mode 100644 --- /dev/null +++ b/data/translations/ast.yaml @@ -0,0 +1,21 @@ +Abstract: Sumariu +Appendix: Apéndiz +Bibliography: Bibliografía +Cc: cc +Chapter: Capítulu +Contents: Conteníu +Encl: incl. +Figure: Figura +Glossary: Glosariu +Index: Índiz +ListOfFigures: Llista de figures +ListOfTables: Llista de tables +Page: Páxina +Part: Parte +Preface: Entamu +Proof: Demostración +References: Referencies +See: ver +SeeAlso: ver tamién +Table: Tabla +To: Pa diff --git a/data/translations/az.yaml b/data/translations/az.yaml new file mode 100644 --- /dev/null +++ b/data/translations/az.yaml @@ -0,0 +1,21 @@ +Abstract: Annotasiya +Appendix: Əlavə +Bibliography: Ədəbiyyat +Cc: cc +Chapter: Fəsil +Contents: Mündəricat +Encl: encl +Figure: Şəkil +Glossary: Terminlər lüğəti +Index: Mövzu göstəricisi +ListOfFigures: Şəkillərin siyahısı +ListOfTables: Cədvəllərin siyahısı +Page: səh. +Part: Hissə +Preface: Ön söz +Proof: İsbatı +References: Ədəbiyyat +See: baxın +SeeAlso: həmçinin baxın +Table: Cədvəl +To: To diff --git a/data/translations/be.yaml b/data/translations/be.yaml new file mode 100644 --- /dev/null +++ b/data/translations/be.yaml @@ -0,0 +1,21 @@ +Abstract: Анатацыя +Appendix: Дадатак +Bibliography: Літаратура +Cc: зых. +Chapter: Глава +Contents: Зьмест +Encl: укл. +Figure: Рыс. +Glossary: Слоўнік тэрмінаў +Index: Прадметны паказальнік +ListOfFigures: Сьпіс ілюстрацый +ListOfTables: Сьпіс табліц +Page: с. +Part: Частка +Preface: Прадмова +Proof: Доказ +References: Сьпіс літаратуры +See: гл. +SeeAlso: гл. таксама +Table: Табліца +To: вх. diff --git a/data/translations/bg.yaml b/data/translations/bg.yaml --- a/data/translations/bg.yaml +++ b/data/translations/bg.yaml @@ -6,14 +6,16 @@ Contents: Съдържание Encl: Приложения Figure: Фигура -Glossary: Glossary +Glossary: Притурка Index: Азбучен указател ListOfFigures: Списък на фигурите ListOfTables: Списък на таблиците Page: Стр. +Part: Част Preface: Предговор -Proof: Proof +Proof: Доказателство References: Литература See: вж. -SeeAlso: вж. също и +SeeAlso: вж. също и Table: Таблица +To: За diff --git a/data/translations/bo.yaml b/data/translations/bo.yaml new file mode 100644 --- /dev/null +++ b/data/translations/bo.yaml @@ -0,0 +1,14 @@ +Abstract: གནད་བསྡུས། +Appendix: ཞར་བྱུང་། +Bibliography: དཔེ་ཆའི་ཐོ་གཞུང་། +Cc: འདྲ་བཤུས་ལེན་མཁན་ +Chapter: ལེའུ་ +Contents: དཀར་ཆག། +Figure: པར་རིས་ +Glossary: མིང་ཚིག་རེའུ་མིག། +Index: གསུལ་བྱང་། +Page: ཤོག་ +Part: ཆ་ཤས་ +Preface: དཔེ་དེབ་ཀྱི་གླེང་བརྗོད། +Proof: བདེན་དཔང་། +Table: རེའུ་མིག་ diff --git a/data/translations/br.yaml b/data/translations/br.yaml new file mode 100644 --- /dev/null +++ b/data/translations/br.yaml @@ -0,0 +1,21 @@ +Abstract: Dvierrañ +Appendix: Stagadenn +Bibliography: Lennadurezh +Cc: Eilskrid da +Chapter: Pennad +Contents: Taolenn +Encl: Dielloù kevret +Figure: Figurenn +Glossary: Glossary +Index: Meneger +ListOfFigures: Listenn ar Figurennoù +ListOfTables: Listenn an taolennoù +Page: Pajenn +Part: Lodenn +Preface: Rakskrid +Proof: Proof +References: Daveennoù +See: Gwelout +SeeAlso: Gwelout ivez +Table: Taolenn +To: evit diff --git a/data/translations/bs.yaml b/data/translations/bs.yaml new file mode 100644 --- /dev/null +++ b/data/translations/bs.yaml @@ -0,0 +1,21 @@ +Abstract: Sažetak +Appendix: Dodatak +Bibliography: Bibliografija +Cc: Kopija +Chapter: Poglavlje +Contents: Sadržaj +Encl: Prilozi +Figure: Slika +Glossary: Rječnik +Index: Indeks +ListOfFigures: Popis slika +ListOfTables: Popis tabela +Page: Stranica +Part: Dio +Preface: Predgovor +Proof: Dokaz +References: Literatura +See: Vidjeti +SeeAlso: Također vidjeti +Table: Tabela +To: Prima diff --git a/data/translations/bua.yaml b/data/translations/bua.yaml new file mode 100644 --- /dev/null +++ b/data/translations/bua.yaml @@ -0,0 +1,17 @@ +Abstract: Тобшолол +Appendix: Хабсаралта +Bibliography: Ном зүй +Chapter: Бүлэг +Contents: Гаршаг +Encl: Оруулаха +Figure: Зураг +Index: Бүгэд хэлхээс +ListOfFigures: Зурагай жагсаалт +ListOfTables: Хүснэгэтэй жагсаалт +Page: Хуудаһан +Part: Бүлэг +Preface: Оршол +References: Ашаглаһан ном +See: Үз +SeeAlso: Mүн үз +Table: Хүсэнэгт diff --git a/data/translations/ckb-Arab.yaml b/data/translations/ckb-Arab.yaml new file mode 100644 --- /dev/null +++ b/data/translations/ckb-Arab.yaml @@ -0,0 +1,21 @@ +Abstract: پوختە +Appendix: پاشکۆ +Bibliography: کتێبنامە +Cc: ڕوونووس +Chapter: بەندی +Contents: نێوەڕۆک +Encl: هاوپێچ +Figure: وێنەی +Glossary: فەرهەنگۆک +Index: پێنوێن +ListOfFigures: لیستی وێنەکان +ListOfTables: لیستی خشتەکان +Page: لاپەڕە +Part: بەشی +Preface: پێشەكی +Proof: سەلماندن +References: سەرچاوەکان +See: چاو لێکەن +SeeAlso: هەروەها چاو لێکەن +Table: خشتەی +To: بۆ diff --git a/data/translations/ckb-Latn.yaml b/data/translations/ckb-Latn.yaml new file mode 100644 --- /dev/null +++ b/data/translations/ckb-Latn.yaml @@ -0,0 +1,21 @@ +Abstract: Puxte +Appendix: Paşko +Bibliography: Kitêbname +Cc: Rûnûs +Chapter: Bendî +Contents: Nêwerrok +Encl: Hawpêç +Figure: Wêney +Glossary: Ferhengok +Index: Pêrrist +ListOfFigures: Lîstî Wênekan +ListOfTables: Lîstî Xiştekan +Page: Laperre +Part: Beşî +Preface: Pêşekî +Proof: Selmandin +References: Serçawekan +See: Çaw lêken +SeeAlso: Herweha çaw lêken +Table: Xiştey +To: Bo diff --git a/data/translations/cs.yaml b/data/translations/cs.yaml --- a/data/translations/cs.yaml +++ b/data/translations/cs.yaml @@ -1,13 +1,13 @@ Abstract: Abstrakt -Appendix: Dodatek +Appendix: Příloha Bibliography: Literatura -Cc: 'Na vědomí:' +Cc: Na vědomí Chapter: Kapitola Contents: Obsah Encl: Příloha Figure: Obrázek Glossary: Slovník -Index: Index +Index: Rejstřík ListOfFigures: Seznam obrázků ListOfTables: Seznam tabulek Page: Strana @@ -16,6 +16,6 @@ Proof: Důkaz References: Reference See: viz -SeeAlso: viz +SeeAlso: viz také Table: Tabulka To: Komu diff --git a/data/translations/cu.yaml b/data/translations/cu.yaml new file mode 100644 --- /dev/null +++ b/data/translations/cu.yaml @@ -0,0 +1,21 @@ +Abstract: Аннотация +Appendix: Приложение +Bibliography: Литература +Cc: исх. +Chapter: Глава +Contents: Содержание +Encl: вкл. +Figure: Рис. +Glossary: Словарь терминов +Index: Предметный указатель +ListOfFigures: Список иллюстраций +ListOfTables: Список таблиц +Page: с. +Part: Часть +Preface: Предисловие +Proof: Доказательство +References: Список литературы +See: см. +SeeAlso: см. также +Table: Таблица +To: вх. diff --git a/data/translations/cy.yaml b/data/translations/cy.yaml new file mode 100644 --- /dev/null +++ b/data/translations/cy.yaml @@ -0,0 +1,21 @@ +Abstract: Crynodeb +Appendix: Atodiad +Bibliography: Llyfryddiaeth +Cc: copïau +Chapter: Pennod +Contents: Cynnwys +Encl: amgaeëdig +Figure: Darlun +Glossary: Rhestr termau +Index: Mynegai +ListOfFigures: Rhestr Ddarluniau +ListOfTables: Rhestr Dablau +Page: tudalen +Part: Rhan +Preface: Rhagair +Proof: Prawf +References: Cyfeiriadau +See: gweler +SeeAlso: gweler hefyd +Table: Taflen +To: At diff --git a/data/translations/cz.yaml b/data/translations/cz.yaml new file mode 100644 --- /dev/null +++ b/data/translations/cz.yaml @@ -0,0 +1,21 @@ +Abstract: Abstrakt +Appendix: Dodatek +Bibliography: Literatura +Cc: Na vědomí +Chapter: Kapitola +Contents: Obsah +Encl: Příloha +Figure: Obrázek +Glossary: Slovník +Index: Index +ListOfFigures: Seznam obrázků +ListOfTables: Seznam tabulek +Page: Strana +Part: Část +Preface: Předmluva +Proof: Důkaz +References: Reference +See: viz +SeeAlso: viz +Table: Tabulka +To: Komu diff --git a/data/translations/da.yaml b/data/translations/da.yaml --- a/data/translations/da.yaml +++ b/data/translations/da.yaml @@ -1,7 +1,7 @@ Abstract: Resumé Appendix: Bilag Bibliography: Litteratur -Cc: Kopi til} +Cc: Kopi til Chapter: Kapitel Contents: Indhold Encl: Vedlagt @@ -18,4 +18,4 @@ See: Se SeeAlso: Se også Table: Tabel -To: Til} +To: Til diff --git a/data/translations/dsb.yaml b/data/translations/dsb.yaml new file mode 100644 --- /dev/null +++ b/data/translations/dsb.yaml @@ -0,0 +1,21 @@ +Abstract: Abstrakt +Appendix: Dodawki +Bibliography: Literatura +Cc: CC +Chapter: Kapitl +Contents: Wopśimjeśe +Encl: Pśiłoga +Figure: Wobraz +Glossary: Glossary +Index: Indeks +ListOfFigures: Zapis wobrazow +ListOfTables: Zapis tabulkow +Page: Strona +Part: Źěl +Preface: Zawod +Proof: Proof +References: Referency +See: gl. +SeeAlso: gl.~teke +Table: Tabulka +To: Komu diff --git a/data/translations/el.yaml b/data/translations/el.yaml --- a/data/translations/el.yaml +++ b/data/translations/el.yaml @@ -8,8 +8,8 @@ Figure: Σχήμα Glossary: Γλωσσάρι Index: Ευρετήριο -ListOfFigures: Κατάλογος σχημάτων -ListOfTables: Κατάλογος πινάκων +ListOfFigures: Κατάλογος Σχημάτων +ListOfTables: Κατάλογος Πινάκων Page: Σελίδα Part: Μέρος Preface: Πρόλογος diff --git a/data/translations/en.yaml b/data/translations/en.yaml --- a/data/translations/en.yaml +++ b/data/translations/en.yaml @@ -9,8 +9,8 @@ Glossary: Glossary Index: Index Listing: Listing -ListOfFigures: ListOfFigures -ListOfTables: ListOfTables +ListOfFigures: List of Figures +ListOfTables: List of Tables Page: page Part: Part Preface: Preface diff --git a/data/translations/eo.yaml b/data/translations/eo.yaml --- a/data/translations/eo.yaml +++ b/data/translations/eo.yaml @@ -11,10 +11,11 @@ ListOfFigures: Listo de figuroj ListOfTables: Listo de tabeloj Page: Paĝo +Part: Parto Preface: Antaŭparolo Proof: Pruvo References: Citaĵoj See: vidu -SeeAlso: Parto +SeeAlso: vidu ankaŭ Table: Tabelo To: Al diff --git a/data/translations/es-ES.yaml b/data/translations/es-ES.yaml new file mode 100644 --- /dev/null +++ b/data/translations/es-ES.yaml @@ -0,0 +1,21 @@ +Abstract: Resumen +Appendix: Apéndice +Bibliography: Bibliografía +Cc: Copia a +Chapter: Capítulo +Contents: Índice general +Encl: Adjunto(s) +Figure: Figura +Glossary: Glosario +Index: Índice alfabético +ListOfFigures: Índice de figuras +ListOfTables: Índice de cuadros +Page: Página +Part: Parte +Preface: Prefacio +Proof: Prueba +References: Referencias +See: véase +SeeAlso: véase también +Table: Cuadro +To: A diff --git a/data/translations/es-MX.yaml b/data/translations/es-MX.yaml new file mode 100644 --- /dev/null +++ b/data/translations/es-MX.yaml @@ -0,0 +1,21 @@ +Abstract: Resumen +Appendix: Apéndice +Bibliography: Bibliografía +Cc: Copia a +Chapter: Capítulo +Contents: Índice +Encl: Anexo +Figure: Figura +Glossary: Glosario +Index: Índice Alfabético +ListOfFigures: Índice de Figuras +ListOfTables: Índice de Cuadros +Page: Página +Part: Parte +Preface: Prefacio +Proof: Demostración +References: Referencias +See: véase +SeeAlso: véase también +Table: Cuadro +To: A diff --git a/data/translations/es.yaml b/data/translations/es.yaml --- a/data/translations/es.yaml +++ b/data/translations/es.yaml @@ -3,17 +3,17 @@ Bibliography: Bibliografía Cc: Copia a Chapter: Capítulo -Contents: Índice general -Encl: Adjunto(s) +Contents: Índice +Encl: Adjunto Figure: Figura Glossary: Glosario Index: Índice alfabético ListOfFigures: Índice de figuras ListOfTables: Índice de cuadros -Page: Página +Page: página Part: Parte Preface: Prefacio -Proof: Prueba +Proof: Demostración References: Referencias See: véase SeeAlso: véase también diff --git a/data/translations/fa.yaml b/data/translations/fa.yaml --- a/data/translations/fa.yaml +++ b/data/translations/fa.yaml @@ -1,21 +1,21 @@ -Abstract: چکیﺪﻫ -Appendix: پیﻮﺴﺗ -Bibliography: کﺕﺎﺑc>ﻧﺎﻤﻫ -Cc: ﺭﻮﻧﻮﺸﺗ -Chapter: ﻒﺼﻟ -Contents: ﻒﻫﺮﺴﺗ ﻢﻃﺎﻠﺑ -Encl: پیﻮﺴﺗ -Figure: ﺶﻜﻟ -Glossary: ﺩﺎﻨﺷc>ﻧﺎﻤﻫ -Index: ﻦﻣﺍیﻩ -ListOfFigures: ﻝیﺲﺗ ﺖﺻﺍﻭیﺭ -ListOfTables: ﻝیﺲﺗ ﺝﺩﺍﻮﻟ -Page: ﺺﻔﺣﺓ -Part: ﺐﺨﺷ -Preface: پیﺵگﻒﺗﺍﺭ -Proof: ﺏﺮﻫﺎﻧ -References: ﻡﺭﺎﺠﻋ -See: ﺐﺑیﻥیﺩ -SeeAlso: ﻥیﺯ ﺐﺑیﻥیﺩ -Table: ﺝﺩﻮﻟ -To: ﺐﻫ +Abstract: چکیده +Appendix: پیوست +Bibliography: کتاب‌نامه +Cc: رونوشت +Chapter: فصل +Contents: فهرست +Encl: پیوست +Figure: شكل +Glossary: فرهنگ‌نامه +Index: نمایه +ListOfFigures: فهرست شکل‌ها +ListOfTables: فهرست جدول‌ها +Page: صفحه +Part: بخش +Preface: پیش‌گفتار +Proof: اثبات +References: مرجع‌ها +See: ببینید +SeeAlso: نیز ببینید +Table: جدول +To: به diff --git a/data/translations/fi.yaml b/data/translations/fi.yaml --- a/data/translations/fi.yaml +++ b/data/translations/fi.yaml @@ -3,7 +3,7 @@ Bibliography: Kirjallisuutta Cc: Jakelu Chapter: Luku -Contents: Sisältö +Contents: Sisällys Encl: Liitteet Figure: Kuva Glossary: Sanasto diff --git a/data/translations/fil.yaml b/data/translations/fil.yaml new file mode 100644 --- /dev/null +++ b/data/translations/fil.yaml @@ -0,0 +1,18 @@ +Abstract: Abstrak +Appendix: Hugpong +Bibliography: Talaaklatan +Chapter: Kabanata +Contents: Talalamanan +Figure: Laraw +Glossary: Glosaryo +Index: Talatuntunan +ListOfFigures: Talalarawan +ListOfTables: Talatalayan +Page: Pahina +Part: Bahagi +Preface: Paunang Salita +Proof: Patunay +References: Talasanggunian +See: tignan ang +SeeAlso: tignan din +Table: Talay diff --git a/data/translations/fur.yaml b/data/translations/fur.yaml new file mode 100644 --- /dev/null +++ b/data/translations/fur.yaml @@ -0,0 +1,21 @@ +Abstract: Somari +Appendix: Zonte +Bibliography: Bibliografie +Cc: Cun copie a +Chapter: Cjapitul +Contents: Tabele gjenerâl +Encl: Zonte(is) +Figure: Figure +Glossary: Glossari +Index: Tabele analitiche +ListOfFigures: Liste des figuris +ListOfTables: Liste des tabelis +Page: Pagjine +Part: Part +Preface: Prefazion +Proof: Dimostrazion +References: Riferiments +See: cjale +SeeAlso: cjale ancje +Table: Tabele +To: Par diff --git a/data/translations/ga.yaml b/data/translations/ga.yaml new file mode 100644 --- /dev/null +++ b/data/translations/ga.yaml @@ -0,0 +1,21 @@ +Abstract: Achoimre +Appendix: Aguisín +Bibliography: Leabharliosta +Cc: cc +Chapter: Caibidil +Contents: Clár Ábhair +Encl: faoi iamh +Figure: Léaráid +Glossary: Glossary +Index: Innéacs +ListOfFigures: Léaráidí +ListOfTables: Táblaí +Page: Leathanach +Part: Cuid +Preface: Réamhrá +Proof: Cruthúnas +References: Tagairtí +See: féach +SeeAlso: féach freisin +Table: Tábla +To: Go diff --git a/data/translations/gd.yaml b/data/translations/gd.yaml new file mode 100644 --- /dev/null +++ b/data/translations/gd.yaml @@ -0,0 +1,21 @@ +Abstract: Brìgh +Appendix: Ath-sgr`ıobhadh +Bibliography: Leabhraichean +Cc: lethbhreac gu +Chapter: Caibideil +Contents: Clàr-obrach +Encl: a-staigh +Figure: Dealbh +Glossary: Glossary +Index: Clàr-innse +ListOfFigures: Liosta Dhealbh +ListOfTables: Liosta Chlàr +Page: t.d. +Part: Cuid +Preface: Preface +Proof: Proof +References: Iomraidh +See: see +SeeAlso: see also +Table: Clàr +To: gu diff --git a/data/translations/gl.yaml b/data/translations/gl.yaml new file mode 100644 --- /dev/null +++ b/data/translations/gl.yaml @@ -0,0 +1,21 @@ +Abstract: Resumo +Appendix: Apéndice +Bibliography: Bibliografía +Cc: Copia a +Chapter: Capítulo +Contents: Índice +Encl: Adxunto +Figure: Figura +Glossary: Glosario +Index: Índice alfabético +ListOfFigures: Índice de figuras +ListOfTables: Índice de cadros +Page: Páxina +Part: Parte +Preface: Prefacio +Proof: Demostración +References: Referencias +See: véxase +SeeAlso: véxase tamén +Table: Cadro +To: A diff --git a/data/translations/grc.yaml b/data/translations/grc.yaml new file mode 100644 --- /dev/null +++ b/data/translations/grc.yaml @@ -0,0 +1,21 @@ +Abstract: Περίληψις +Appendix: Παράρτημα +Bibliography: Βιβλιογραφία +Cc: Κοινοποίησις +Chapter: Κεφάλαιον +Contents: Περιεχόμενα +Encl: Συνημμένως +Figure: Σχῆμα +Glossary: Γλωσσάριον +Index: Εὑρετήριον +ListOfFigures: Κατάλογος σχημάτων +ListOfTables: Κατάλογος πινάκων +Page: Σελὶς +Part: Μέρος +Preface: Προοίμιον +Proof: Ἀπόδειξις +References: Ἀναφοραὶ +See: ὃρα +SeeAlso: ὃρα ὡσαύτως +Table: Πίναξ +To: Πρὸς diff --git a/data/translations/gu.yaml b/data/translations/gu.yaml new file mode 100644 --- /dev/null +++ b/data/translations/gu.yaml @@ -0,0 +1,9 @@ +Appendix: અનુસૂચિ +Chapter: પ્રકરણ +Index: અનુક્રમણિકા +Page: પાનુ +Part: ભાગ +Proof: પુરાવો +See: જુવો +SeeAlso: ઉપરાંત +Table: ટેબલ diff --git a/data/translations/ha.yaml b/data/translations/ha.yaml new file mode 100644 --- /dev/null +++ b/data/translations/ha.yaml @@ -0,0 +1,21 @@ +Abstract: Taƙaitawa +Appendix: Ƙarin bayani +Bibliography: Fahirinsa +Cc: cc +Chapter: Babi +Contents: Abin da ke ciki +Encl: saƙe +Figure: Addadi +Glossary: Ƙamus +Index: Fihirinsa +ListOfFigures: Tsarin Addadi +ListOfTables: Tsarin tabili +Page: Shafi +Part: Kashi +Preface: Gabatarwa +Proof: Shaida +References: Nassoshi +See: duba +SeeAlso: kuma +Table: tabili +To: je diff --git a/data/translations/he.yaml b/data/translations/he.yaml --- a/data/translations/he.yaml +++ b/data/translations/he.yaml @@ -6,17 +6,16 @@ Contents: תוכן העניינים Encl: רצ"ב Figure: איור -Glossary: מילון מונחים} +Glossary: מילון מונחים Index: מפתח ListOfFigures: רשימת האיורים ListOfTables: רשימת הטבלאות Page: עמוד Part: חלק Preface: מבוא -Proof: הוכחה} -Ps: נ.ב. +Proof: הוכחה References: מקורות See: ראה -SeeAlso: ראה גם} +SeeAlso: ראה גם Table: טבלה To: אל diff --git a/data/translations/hi.yaml b/data/translations/hi.yaml --- a/data/translations/hi.yaml +++ b/data/translations/hi.yaml @@ -1,20 +1,18 @@ Abstract: सारांश Appendix: परिशिष्ट -Bibliography: संदर ग्रन्थ} -Cc: +Bibliography: संदर्भ-ग्रन्थ Chapter: अध्याय -Contents: विषय सूची -Encl: -Figure: चित्र} -Headpage: पृषठ +Contents: अनुक्रम +Figure: चित्र +Glossary: शब्दार्थ सूची Index: सूची ListOfFigures: चित्रों की सूची ListOfTables: तालिकाओं की सूची -Page: पृषठ -Part: खणड -Preface: प्रस्तावना} +Page: पृष्ठ +Part: खण्ड +Preface: प्रस्तावना +Proof: प्रमाण References: हवाले See: देखिए SeeAlso: और देखिए Table: तालिका -To: diff --git a/data/translations/hsb.yaml b/data/translations/hsb.yaml new file mode 100644 --- /dev/null +++ b/data/translations/hsb.yaml @@ -0,0 +1,21 @@ +Abstract: Abstrakt +Appendix: Dodawki +Bibliography: Literatura +Cc: CC +Chapter: Kapitl +Contents: Wobsah +Encl: Přłoha +Figure: Wobraz +Glossary: Glossary +Index: Indeks +ListOfFigures: Zapis wobrazow +ListOfTables: Zapis tabulkow +Page: Strona +Part: Dźěl +Preface: Zawod +Proof: Proof +References: Referency +See: hl. +SeeAlso: hl.~tež +Table: Tabulka +To: Komu diff --git a/data/translations/hu.yaml b/data/translations/hu.yaml --- a/data/translations/hu.yaml +++ b/data/translations/hu.yaml @@ -1,5 +1,5 @@ Abstract: Kivonat -Appendix: Függelék +Appendix: függelék Bibliography: Irodalomjegyzék Cc: Körlevél–címzettek Chapter: fejezet diff --git a/data/translations/hy.yaml b/data/translations/hy.yaml new file mode 100644 --- /dev/null +++ b/data/translations/hy.yaml @@ -0,0 +1,20 @@ +Abstract: Սեղմագիր +Appendix: Հավելված +Bibliography: Գրականություն +Cc: Կրկնօրինակը՝ +Chapter: Գլուխ +Contents: Բովանդակություն +Encl: Կից՝ +Figure: Նկար +Glossary: Տերմինների ցանկ +Index: Առարկայական ցանկ +ListOfFigures: Նկարների ցանկ +ListOfTables: Աղյուսակների ցանկ +Page: էջ +Part: Մաս +Preface: Նախաբան +Proof: Ապացույց +References: Հղումներ +See: տե՛ս +SeeAlso: տե՛ս նաև +Table: Աղյուսակ diff --git a/data/translations/ia.yaml b/data/translations/ia.yaml new file mode 100644 --- /dev/null +++ b/data/translations/ia.yaml @@ -0,0 +1,21 @@ +Abstract: Summario +Appendix: Appendice +Bibliography: Bibliographia +Cc: Copia +Chapter: Capitulo +Contents: Contento +Encl: Incluso +Figure: Figura +Glossary: Glossario +Index: Indice +ListOfFigures: Lista de figuras +ListOfTables: Lista de tabellas +Page: Pagina +Part: Parte +Preface: Prefacio +Proof: Prova +References: Referentias +See: vide +SeeAlso: vide etiam +Table: Tabella +To: A diff --git a/data/translations/id.yaml b/data/translations/id.yaml new file mode 100644 --- /dev/null +++ b/data/translations/id.yaml @@ -0,0 +1,21 @@ +Abstract: Ringkasan +Appendix: Lampiran +Bibliography: Bibliografi +Cc: cc +Chapter: Bab +Contents: Daftar Isi +Encl: Lampiran +Figure: Gambar +Glossary: Daftar Istilah +Index: Indeks +ListOfFigures: Daftar Gambar +ListOfTables: Daftar Tabel +Page: Halaman +Part: Bagian +Preface: Pendahuluan +Proof: Bukti +References: Pustaka +See: lihat +SeeAlso: lihat juga +Table: Tabel +To: Kepada diff --git a/data/translations/is.yaml b/data/translations/is.yaml --- a/data/translations/is.yaml +++ b/data/translations/is.yaml @@ -18,4 +18,4 @@ See: Sjá SeeAlso: Sjá einnig Table: Tafla -To: Til: +To: Til diff --git a/data/translations/it.yaml b/data/translations/it.yaml --- a/data/translations/it.yaml +++ b/data/translations/it.yaml @@ -1,7 +1,7 @@ Abstract: Sommario Appendix: Appendice Bibliography: Bibliografia -Cc: e p. c. +Cc: e~p.~c. Chapter: Capitolo Contents: Indice Encl: Allegati diff --git a/data/translations/ja.yaml b/data/translations/ja.yaml new file mode 100644 --- /dev/null +++ b/data/translations/ja.yaml @@ -0,0 +1,21 @@ +Abstract: 概要 +Appendix: 付録 +Bibliography: 文献目録 +Cc: 同報 +Chapter: 章 +Contents: 目次 +Encl: 添付 +Figure: 図 +Glossary: 用語集 +Index: 索引 +ListOfFigures: 図目次 +ListOfTables: 表目次 +Page: 頁 +Part: 部 +Preface: 端書き +Proof: 証明 +References: 参考文献 +See: 参照 +SeeAlso: 参照 +Table: 表 +To: 宛先 diff --git a/data/translations/ka.yaml b/data/translations/ka.yaml new file mode 100644 --- /dev/null +++ b/data/translations/ka.yaml @@ -0,0 +1,21 @@ +Abstract: ანოტაცია +Appendix: დანართი +Bibliography: ლიტერატურა +Cc: წყარ. +Chapter: თავი +Contents: შინაარსი +Encl: ჩათვ. +Figure: სურ. +Glossary: ტერმინები +Index: საძიებელი +ListOfFigures: სურათი +ListOfTables: ცხრილი +Page: გვ. +Part: ნაწილი +Preface: წინასიტყვაობა +Proof: დამტკიცება +References: ლიტერატურა +See: იხ. +SeeAlso: იხ. ასევე +Table: ცხრ. +To: შ. diff --git a/data/translations/kmr-Arab.yaml b/data/translations/kmr-Arab.yaml new file mode 100644 --- /dev/null +++ b/data/translations/kmr-Arab.yaml @@ -0,0 +1,21 @@ +Abstract: کورتەبیر +Appendix: پاشکۆ +Bibliography: چاڤکانییا پرتووکان +Cc: بەلاڤکەر +Chapter: سەرێ +Contents: ناڤێرۆک +Encl: دوماهک +Figure: دیمەنێ +Glossary: چاڤکانییا لێکۆلینێ +Index: پێرست +ListOfFigures: هەژمارا دیمەنا +ListOfTables: هەژمارا کەڤالێن +Page: رووپەلێ +Part: بەشا +Preface: پێشگۆتن +Proof: دەلیل +References: پرتووکێن بژارتی +See: بنێرا +SeeAlso: لە ڤێیا ژ بنێرا +Table: کەڤالا +To: ژ بۆ diff --git a/data/translations/kmr-Latn.yaml b/data/translations/kmr-Latn.yaml new file mode 100644 --- /dev/null +++ b/data/translations/kmr-Latn.yaml @@ -0,0 +1,21 @@ +Abstract: Kurtebîr +Appendix: Tebînîya +Bibliography: Çavkanîya Pirtukan +Cc: Belavker +Chapter: Serê +Contents: Navêrok +Encl: Dumahik +Figure: Dimenê +Glossary: Çavkanîya lêkolînê +Index: Endeks +ListOfFigures: Hejmara Dimena +ListOfTables: Hejmara Kevalen +Page: Rûpelê +Part: Bêşa +Preface: Peşgotin +Proof: Delîl +References: Pirtuken bijartî +See: binêra +SeeAlso: le vêya ji binêra +Table: Kevala +To: Ji bo diff --git a/data/translations/kn.yaml b/data/translations/kn.yaml new file mode 100644 --- /dev/null +++ b/data/translations/kn.yaml @@ -0,0 +1,20 @@ +Abstract: ಸಾರಾಂಶ +Appendix: ಅನುಬಂಧ +Bibliography: ಗ್ರಂಥಸೂಚಿ +Cc: cc +Chapter: ಅಧ್ಯಾಯ +Contents: ವಿಷಯಗಳು +Encl: encl +Figure: ಚಿತ್ರ +Index: ಸೂಚಿ +ListOfFigures: ಚಿತ್ರಗಳ ಪಟ್ಟಿ +ListOfTables: ಕೋಷ್ಟಕಗಳ ಪಟ್ಟಿ +Page: ಪುಟ +Part: ಭಾಗ +Preface: ಮುನ್ನುಡಿ +Proof: ಕರಡುಪ್ರತಿ +References: ಉಲ್ಲೇಖಗಳು +See: ನೋಡು +SeeAlso: ಇದನ್ನೂ ಸಹ ನೋಡು +Table: ಕೋಷ್ಟಕ +To: ಗೆ diff --git a/data/translations/la.yaml b/data/translations/la.yaml new file mode 100644 --- /dev/null +++ b/data/translations/la.yaml @@ -0,0 +1,20 @@ +Abstract: Summarium +Appendix: Additamentum +Bibliography: Conspectus librorum +Cc: Exemplar +Chapter: Caput +Contents: Index +Encl: Additur +Figure: Descriptio +Glossary: Glossarium +Index: Index rerum notabilium +ListOfFigures: Conspectus descriptionum +ListOfTables: Conspectus tabularum +Page: charta +Part: Pars +Preface: Praefatio +Proof: Demonstratio +References: Conspectus librorum +See: cfr. +SeeAlso: cfr. +Table: Tabula diff --git a/data/translations/lb.yaml b/data/translations/lb.yaml new file mode 100644 --- /dev/null +++ b/data/translations/lb.yaml @@ -0,0 +1,21 @@ +Abstract: Resümee +Appendix: Annex +Bibliography: Bibliographie +Cc: Distributeur +Chapter: Kapitel +Contents: Contenue +Encl: Annex(en) +Figure: Bild +Glossary: Glossär +Index: Index +ListOfFigures: Lëscht vun de Biller +ListOfTables: Lëscht vun den Tabellen +Page: Säit +Part: Deel +Preface: Virwuert +Proof: Beweis +References: Literatur +See: kuck +SeeAlso: kuck och +Table: Tabell +To: Un diff --git a/data/translations/lv.yaml b/data/translations/lv.yaml --- a/data/translations/lv.yaml +++ b/data/translations/lv.yaml @@ -1,12 +1,12 @@ Abstract: Anotācija Appendix: Pielikums Bibliography: Literatūra -Cc: cc +Cc: Kopija(s) Chapter: Nodaļa Contents: Saturs -Encl: encl +Encl: Pielikumā Figure: Att. -Index: Index +Index: Priekšmetu rādītājs ListOfFigures: Attēlu saraksts ListOfTables: Tabulu saraksts Page: lpp. diff --git a/data/translations/mk.yaml b/data/translations/mk.yaml new file mode 100644 --- /dev/null +++ b/data/translations/mk.yaml @@ -0,0 +1,21 @@ +Abstract: Апстракт +Appendix: Прилог +Bibliography: Библиографиjа +Cc: копиjа +Chapter: Глава +Contents: Содржина +Encl: Прилози +Figure: Слика +Glossary: Речник +Index: Индекс на термини +ListOfFigures: Листа на слики +ListOfTables: Листа на табели +Page: стр. +Part: Дел +Preface: Предговор +Proof: доказ +References: Литература +See: види +SeeAlso: види исто така +Table: Табела +To: За diff --git a/data/translations/ml.yaml b/data/translations/ml.yaml new file mode 100644 --- /dev/null +++ b/data/translations/ml.yaml @@ -0,0 +1,12 @@ +Abstract: സാരാംശം +Appendix: ശിഷ്ടം +Chapter: അദ്ധ്യായം +Contents: ഉള്ളടക്കം +Figure: ചിത്രം +Index: സൂചിക +ListOfFigures: ചിത്രസൂചിക +ListOfTables: പട്ടികകളുടെ സൂചിക +Part: ഭാഗം +See: കാണുക +SeeAlso: ഇതും കാണുക +Table: പട്ടിക diff --git a/data/translations/mn.yaml b/data/translations/mn.yaml new file mode 100644 --- /dev/null +++ b/data/translations/mn.yaml @@ -0,0 +1,19 @@ +Abstract: Удиртгал +Appendix: Хавсралт +Bibliography: Номзүй +Cc: э.с. +Chapter: Бүлэг +Contents: Гарчиг +Encl: Ишлэл +Figure: Зураг +Index: Товъёг +ListOfFigures: Зургийн жагсаалт +ListOfTables: Хүснэгтийн жагсаалт +Page: тал +Part: Хэсэг +Preface: Өмнөх үг +Proof: Баталгаа +References: Ашигласан ном +See: талд үз +SeeAlso: мөн талд үз +Table: Хүснэгт diff --git a/data/translations/mr.yaml b/data/translations/mr.yaml new file mode 100644 --- /dev/null +++ b/data/translations/mr.yaml @@ -0,0 +1,21 @@ +Abstract: सारांश +Appendix: परिशिष्ट +Bibliography: संदर्भसूची +Cc: प्रत +Chapter: प्रकरण +Contents: अनुक्रमणिका +Encl: समाविष्ट +Figure: आकृती +Glossary: संज्ञासूची +Index: सूची +ListOfFigures: आकृत्यांची सूची +ListOfTables: कोष्टकसूची +Page: पृष्ठ +Part: खंड +Preface: प्रस्तावना +Proof: सिद्धता +References: संदर्भ +See: पाहा +SeeAlso: हेदेखील पाहा +Table: कोष्टक +To: प्रति diff --git a/data/translations/ms.yaml b/data/translations/ms.yaml new file mode 100644 --- /dev/null +++ b/data/translations/ms.yaml @@ -0,0 +1,21 @@ +Abstract: Abstrak +Appendix: Lampiran +Bibliography: Bibliografi +Cc: sk +Chapter: Bab +Contents: Kandungan +Encl: Lampiran +Figure: Gambar +Glossary: Istilah +Index: Indeks +ListOfFigures: Senarai Gambar +ListOfTables: Senarai Jadual +Page: Halaman +Part: Bahagian +Preface: Prakata +Proof: Bukti +References: Rujukan +See: sila rujuk +SeeAlso: rujuk juga +Table: Jadual +To: Kepada diff --git a/data/translations/nko.yaml b/data/translations/nko.yaml new file mode 100644 --- /dev/null +++ b/data/translations/nko.yaml @@ -0,0 +1,21 @@ +Abstract: ߓߊߕߐߡߐ߲ +Appendix: ߘߋ߬ߙߋ +Bibliography: ߟߍߙߊߥߙߍߟߐ߲߲ +Cc: ߓߊ ߘߏ߫ ߘߌ߫ +Chapter: ߛߌ߰ߘߊ +Contents: ߞߣߐߘߐ +Encl: ߝߍ߬ߕߊ +Figure: ߢߊ +Glossary: ߞߘߐߝߐߟߊ߲ +Index: ߛߙߍߘߍ +ListOfFigures: ߢߊ ߟߎ߬ ߛߙߍߘߍ +ListOfTables: ߦߌ߬ߘߊ߬ߥߟߊ ߟߎ߬ ߛߙߍߘߍ +Page: ߞߐߜߍ +Part: ߛߌ߰ߘߊ߬ߙߋ߲ +Preface: ߢߍߛߓߍ +Proof: ߦߌ߬ߘߊ߬ߞߏ +References: ߞߐߡߊߛߙߋ +See: ߡߊߝߟߍ߫ +SeeAlso: ߝߟߍߡߊߛߊ߬ߦߌ߬ +Table: ߦߌ߬ߘߊ߬ߥߟߊ +To: ߞߊߕߙߍ߬ diff --git a/data/translations/nl.yaml b/data/translations/nl.yaml --- a/data/translations/nl.yaml +++ b/data/translations/nl.yaml @@ -1,19 +1,19 @@ Abstract: Samenvatting -Appendix: Bijlage +Appendix: Bijlage Bibliography: Bibliografie Cc: cc Chapter: Hoofdstuk Contents: Inhoudsopgave -Encl: Bijlage(n) +Encl: Bijlage(n) Figure: Figuur -Glossary: Verklarende woordenlijst +Glossary: Verklarende Woordenlijst Index: Index -ListOfFigures: Lijst van figuren -ListOfTables: Lijst van tabellen +ListOfFigures: Lijst van figuren +ListOfTables: Lijst van tabellen Page: Pagina Part: Deel Preface: Voorwoord -Proof: Bewijs +Proof: Bewijs References: Referenties See: zie SeeAlso: zie ook diff --git a/data/translations/nn.yaml b/data/translations/nn.yaml --- a/data/translations/nn.yaml +++ b/data/translations/nn.yaml @@ -1,7 +1,7 @@ Abstract: Samandrag Appendix: Tillegg -Bibliography: Bibliografi -Cc: Kopi sendt +Bibliography: Litteratur +Cc: Kopi til Chapter: Kapittel Contents: Innhald Encl: Vedlegg diff --git a/data/translations/oc.yaml b/data/translations/oc.yaml new file mode 100644 --- /dev/null +++ b/data/translations/oc.yaml @@ -0,0 +1,21 @@ +Abstract: Resumit +Appendix: Annèx +Bibliography: Bibliografia +Cc: còpia a +Chapter: Capítol +Contents: Ensenhador +Encl: Pèça junta +Figure: Figura +Glossary: Glossari +Index: Indèx +ListOfFigures: Taula de las figuras +ListOfTables: Taula dels tablèus +Page: Pagina +Part: Partida +Preface: Prefàcia +Proof: Demostracion +References: Referéncias +See: vejatz +SeeAlso: vejatz tanben +Table: Tablèu +To: A diff --git a/data/translations/or.yaml b/data/translations/or.yaml new file mode 100644 --- /dev/null +++ b/data/translations/or.yaml @@ -0,0 +1,21 @@ +Abstract: ସାରାଂଶ +Appendix: ପରିଶିଷ୍ଟ +Bibliography: ସୂଚନା +Cc: କପି କରନ୍ତୁ +Chapter: ଅଧ୍ୟାୟ +Contents: ସୁଚୀ ପତ୍ର +Encl: ସଂଲଗ୍ନ +Figure: ପ୍ରତିଛବି +Glossary: ଶବ୍ଦର ଶବ୍ଦକୋଷ +Index: ସୂଚକାଙ୍କ +ListOfFigures: ପ୍ରତିଛବି ତାଲିକା +ListOfTables: ଟେବୁଲ ତାଲିକା +Page: ପୃଷ୍ଠା +Part: ବିଭାଗ +Preface: ପ୍ରାରମ୍ଭ +Proof: ପ୍ରମାଣ +References: ସନ୍ଦର୍ଭ +See: ଦେଖନ୍ତୁ +SeeAlso: ଅଧିକ ଦେଖନ୍ତୁ +Table: ଟେବୁଲ୍ +To: ପ୍ରତି diff --git a/data/translations/pa.yaml b/data/translations/pa.yaml new file mode 100644 --- /dev/null +++ b/data/translations/pa.yaml @@ -0,0 +1,20 @@ +Abstract: ਨਿਚੋੜ +Appendix: ਲੜੀਵਾਰ +Bibliography: ਸੰਬੰਧਤ ਹਵਾਲੇ +Cc: ਕਾਪੀ +Chapter: ਪਾਠ +Contents: ਸਮਗਰੀ +Encl: ਨੱਥੀ +Figure: ਸ਼ਕਲ +Glossary: ਕੁੰਜੀ +Index: ਸੂਚੀ +ListOfFigures: ਸ਼ਕਲਾਂ ਦੀ ਲੜੀ +ListOfTables: ਲੜੀਆਂ ਦਾ ਲੇਖਾ +Page: ਵਰਕਾ +Part: ਹਿੱਸਾ +Preface: ਮੁੱਖਬੰਦ +Proof: ਪਰਮਾਣ +References: ਹਵਾਲਾ +See: ਵੇਖੋ +SeeAlso: ਹੋਰ +Table: ਲੇਖਾ diff --git a/data/translations/pl.yaml b/data/translations/pl.yaml --- a/data/translations/pl.yaml +++ b/data/translations/pl.yaml @@ -1,7 +1,7 @@ Abstract: Streszczenie Appendix: Dodatek Bibliography: Bibliografia -Cc: 'Kopie:' +Cc: Kopie Chapter: Rozdział Contents: Spis treści Encl: Załącznik diff --git a/data/translations/pms.yaml b/data/translations/pms.yaml new file mode 100644 --- /dev/null +++ b/data/translations/pms.yaml @@ -0,0 +1,21 @@ +Abstract: Somari +Appendix: Gionta +Bibliography: Bibliografìa +Cc: Con còpia a +Chapter: Capìtol +Contents: Tàula +Encl: Gionta/e +Figure: Figura +Glossary: Glossari +Index: Tàula analìtica +ListOfFigures: Lista dle figure +ListOfTables: Lista dle tabele +Page: Pàgina +Part: Part +Preface: Prefassion +Proof: Dimostrassion +References: Riferiment +See: vëd +SeeAlso: vëd anche +Table: Tabela +To: Për diff --git a/data/translations/pt-BR.yaml b/data/translations/pt-BR.yaml new file mode 100644 --- /dev/null +++ b/data/translations/pt-BR.yaml @@ -0,0 +1,21 @@ +Abstract: Resumo +Appendix: Apêndice +Bibliography: Referências Bibliográficas +Cc: Cópia para +Chapter: Capítulo +Contents: Sumário +Encl: Anexo +Figure: Figura +Glossary: Glossário +Index: Índice Remissivo +ListOfFigures: Lista de Figuras +ListOfTables: Lista de Tabelas +Page: Página +Part: Parte +Preface: Prefácio +Proof: Demonstração +References: Referências +See: veja +SeeAlso: veja também +Table: Tabela +To: Para diff --git a/data/translations/pt-PT.yaml b/data/translations/pt-PT.yaml new file mode 100644 --- /dev/null +++ b/data/translations/pt-PT.yaml @@ -0,0 +1,21 @@ +Abstract: Resumo +Appendix: Apêndice +Bibliography: Bibliografia +Cc: Com cópia a +Chapter: Capítulo +Contents: Conteúdo +Encl: Anexo +Figure: Figura +Glossary: Glossário +Index: Índice +ListOfFigures: Lista de Figuras +ListOfTables: Lista de Tabelas +Page: Página +Part: Parte +Preface: Prefácio +Proof: Demonstração +References: Referências +See: ver +SeeAlso: ver também +Table: Tabela +To: Para diff --git a/data/translations/ro.yaml b/data/translations/ro.yaml --- a/data/translations/ro.yaml +++ b/data/translations/ro.yaml @@ -12,8 +12,8 @@ ListOfTables: Listă de tabele Page: Pagina Part: Partea -Preface: Prefață -Proof: Demonstrație +Preface: Prefaţă +Proof: Demonstraţie References: Bibliografie See: Vezi SeeAlso: Vezi de asemenea diff --git a/data/translations/ru.yaml b/data/translations/ru.yaml --- a/data/translations/ru.yaml +++ b/data/translations/ru.yaml @@ -3,9 +3,10 @@ Bibliography: Литература Cc: исх. Chapter: Глава -Contents: Оглавление +Contents: Содержание Encl: вкл. Figure: Рис. +Glossary: Словарь терминов Index: Предметный указатель ListOfFigures: Список иллюстраций ListOfTables: Список таблиц @@ -15,6 +16,6 @@ Proof: Доказательство References: Список литературы See: см. -SeeAlso: см. также +SeeAlso: см. также Table: Таблица To: вх. diff --git a/data/translations/se.yaml b/data/translations/se.yaml new file mode 100644 --- /dev/null +++ b/data/translations/se.yaml @@ -0,0 +1,21 @@ +Abstract: Čoahkkáigeassu +Appendix: Čuovus +Bibliography: Girjjálašvuohta +Cc: Kopia sáddejuvvon +Chapter: Kapihttal +Contents: Sisdoallu +Encl: Mielddus +Figure: Govus +Glossary: Sátnelistu +Index: Registtar +ListOfFigures: Govvosat +ListOfTables: Tabeallat +Page: Siidu +Part: Oassi +Preface: Ovdasátni +Proof: Duođaštus +References: Čujuhusat +See: geahča +SeeAlso: geahča maiddái +Table: Tabealla +To: Vuostáiváldi diff --git a/data/translations/si.yaml b/data/translations/si.yaml new file mode 100644 --- /dev/null +++ b/data/translations/si.yaml @@ -0,0 +1,21 @@ +Abstract: සංක්ෂෙපය +Appendix: උපග්‍රන්ථය +Bibliography: ග්‍රන්ථ නාමාවලිය +Cc: පිටපත් +Chapter: පරිච්ඡේදය +Contents: පටුන +Encl: ඇමුණුම +Figure: සටහන +Glossary: පදමාලාව +Index: සූචිය +ListOfFigures: සටහන් ලේඛනය +ListOfTables: වගු ලේඛනය +Page: පිට +Part: කොටස +Preface: පෙරවදන +Proof: සාධනය +References: යොමුව +See: බලනු +SeeAlso: තවද +Table: වගුව +To: වෙත diff --git a/data/translations/sk.yaml b/data/translations/sk.yaml --- a/data/translations/sk.yaml +++ b/data/translations/sk.yaml @@ -4,17 +4,17 @@ Cc: cc. Chapter: Kapitola Contents: Obsah -Encl: Prílohy -Figure: Obrázok +Encl: Príloha +Figure: Obr. Glossary: Slovník -Index: Index +Index: Register ListOfFigures: Zoznam obrázkov ListOfTables: Zoznam tabuliek -Page: Strana +Page: Str. Part: Časť -Preface: Úvod +Preface: Predhovor Proof: Dôkaz -References: Referencie +References: Literatúra See: viď SeeAlso: viď tiež Table: Tabuľka diff --git a/data/translations/sq.yaml b/data/translations/sq.yaml --- a/data/translations/sq.yaml +++ b/data/translations/sq.yaml @@ -1,8 +1,10 @@ Abstract: Përmbledhja Appendix: Shtesa Bibliography: Bibliografia +Cc: Kopja Chapter: Kapitulli -Contents: Përmbajta +Contents: Përmbajtja +Encl: Lidhja Figure: Figura Glossary: Përhasja e Fjalëve Index: Indeksi @@ -16,3 +18,4 @@ See: shiko SeeAlso: shiko dhe Table: Tabela +To: Për diff --git a/data/translations/sr-Cyrl.yaml b/data/translations/sr-Cyrl.yaml new file mode 100644 --- /dev/null +++ b/data/translations/sr-Cyrl.yaml @@ -0,0 +1,21 @@ +Abstract: Сажетак +Appendix: Додатак +Bibliography: Библиографиjа +Cc: Копиjе +Chapter: Глава +Contents: Садржаj +Encl: Прилози +Figure: Слика +Glossary: Речник +Index: Индекс +ListOfFigures: Списак слика +ListOfTables: Списак табела +Page: страна +Part: Део +Preface: Предговор +Proof: Доказ +References: Литература +See: види +SeeAlso: видитакође +Table: Табела +To: Прима diff --git a/data/translations/sr-Latn.yaml b/data/translations/sr-Latn.yaml new file mode 100644 --- /dev/null +++ b/data/translations/sr-Latn.yaml @@ -0,0 +1,21 @@ +Abstract: Sažetak +Appendix: Dodatak +Bibliography: Bibliografija +Cc: Kopije +Chapter: Glava +Contents: Sadržaj +Encl: Prilozi +Figure: Slika +Glossary: Rečnik +Index: Indeks +ListOfFigures: Spisak slika +ListOfTables: Spisak tabela +Page: strana +Part: Deo +Preface: Predgovor +Proof: Dokaz +References: Literatura +See: vidi +SeeAlso: vidi takođe +Table: Tabela +To: Prima diff --git a/data/translations/sr-cyrl.yaml b/data/translations/sr-cyrl.yaml deleted file mode 100644 --- a/data/translations/sr-cyrl.yaml +++ /dev/null @@ -1,21 +0,0 @@ -Abstract: Сажетак -Appendix: Додатак -Bibliography: Литература -Cc: Копије -Chapter: Глава -Contents: Садржај -Encl: Прилози -Figure: Слика -Glossary: Речник непознатих речи -Index: Регистар -ListOfFigures: Списак слика -ListOfTables: Списак табела -Page: Страна -Part: Део -Preface: Предговор -Proof: Доказ -References: Библиографија -See: Види -SeeAlso: Види такође -Table: Табела -To: Прима diff --git a/data/translations/sr.yaml b/data/translations/sr.yaml --- a/data/translations/sr.yaml +++ b/data/translations/sr.yaml @@ -1,21 +1,21 @@ -Abstract: Sažetak -Appendix: Dodatak -Bibliography: Literatura -Cc: Kopije -Chapter: Glava -Contents: Sadržaj -Encl: Prilozi -Figure: Slika -Glossary: Rečnik nepoznatih reči -Index: Registar -ListOfFigures: Spisak slika -ListOfTables: Spisak tabela -Page: Strana -Part: Deo -Preface: Predgovor -Proof: Dokaz -References: Bibliografija -See: Vidi -SeeAlso: Vidi takođe -Table: Tabela -To: Prima +Abstract: Сажетак +Appendix: Додатак +Bibliography: Библиографиjа +Cc: Копиjе +Chapter: Глава +Contents: Садржаj +Encl: Прилози +Figure: Слика +Glossary: Речник +Index: Индекс +ListOfFigures: Списак слика +ListOfTables: Списак табела +Page: страна +Part: Део +Preface: Предговор +Proof: Доказ +References: Литература +See: види +SeeAlso: видитакође +Table: Табела +To: Прима diff --git a/data/translations/ta.yaml b/data/translations/ta.yaml new file mode 100644 --- /dev/null +++ b/data/translations/ta.yaml @@ -0,0 +1,11 @@ +Abstract: சாராம்சம் +Appendix: பிற்சேர்க்கை +Chapter: அத்தியாயம் +Contents: உள்ளே +Figure: படம் +Index: சுட்டி +ListOfFigures: படங்களின் பட்டியல் +ListOfTables: அட்டவணை பட்டியல் +Part: பகுதி +See: பார்க்க +Table: அட்டவணை diff --git a/data/translations/te.yaml b/data/translations/te.yaml new file mode 100644 --- /dev/null +++ b/data/translations/te.yaml @@ -0,0 +1,21 @@ +Abstract: సారాంశం +Appendix: అదనంగా +Bibliography: గ్రంథాల జాబితా +Cc: సిసి +Chapter: అధ్యాయము +Contents: విషయాలు +Encl: ఎంక్లోజర్* +Figure: ఆకృతి +Glossary: నిఘంటువు +Index: విషయ సూచిక +ListOfFigures: ఆకృతుల జాబితా +ListOfTables: పట్టికల జాబితా +Page: పేజి +Part: భాగం +Preface: ముందుమాట +Proof: రుజువు +References: ఆధారాలు +See: చూడండి +SeeAlso: కూడా చూడండి +Table: పట్టిక +To: కి diff --git a/data/translations/th.yaml b/data/translations/th.yaml --- a/data/translations/th.yaml +++ b/data/translations/th.yaml @@ -11,7 +11,7 @@ ListOfTables: สารบัญตาราง Page: หน้า Part: ภาค -Preface: คำนำ +Preface: บทนำ Proof: พิสูจน์ References: หนังสืออ้างอิง See: ดู diff --git a/data/translations/tk.yaml b/data/translations/tk.yaml new file mode 100644 --- /dev/null +++ b/data/translations/tk.yaml @@ -0,0 +1,21 @@ +Abstract: Gysgaça manysy +Appendix: Goşmaça +Bibliography: Çeşmeler +Cc: Iberilenler +Chapter: Bap +Contents: Mazmuny +Encl: Goşmaça +Figure: Surat +Glossary: Sözlük +Index: Indeks +ListOfFigures: Suratlaryň sanawy +ListOfTables: Tablisalaryň sanawy +Page: Sahypa +Part: Bölüm +Preface: Sözbaşy +Proof: Delil +References: Çeşmeler +See: ser. +SeeAlso: şuňa-da ser. +Table: Tablisa +To: Kime diff --git a/data/translations/ua.yaml b/data/translations/ua.yaml new file mode 100644 --- /dev/null +++ b/data/translations/ua.yaml @@ -0,0 +1,22 @@ +Abstract: Резюме +Appendix: Додаток +Bibliography: Бібліографія +Cc: Розповсюджувач +Chapter: Розділ +Contents: Зміст +Encl: Додаток(и) +Figure: Ілюстрація +Glossary: Глосарій +Index: Індекс +Listing: Список +ListOfFigures: Список рисунків +ListOfTables: Список таблиць +Page: Сторінка +Part: Частина +Preface: Передмова +Proof: Докази +References: Література +See.: див. +SeeAlso: див. також +Table: Таблиця +To: До diff --git a/data/translations/ug.yaml b/data/translations/ug.yaml new file mode 100644 --- /dev/null +++ b/data/translations/ug.yaml @@ -0,0 +1,21 @@ +Abstract: ئابستراكت +Appendix: قوشۇمچە +Bibliography: پايدىلانما +Cc: باشقا تاپشۇرۇۋالغۇچى +Chapter: باب +Contents: مۇندەرىجە +Encl: قوشۇمچە ھۆججەت +Figure: رەسىم +Glossary: لۇغەت +Index: ئىندېكىس +ListOfFigures: رەسىملەر +ListOfTables: جەدۋەللەر +Page: بەت +Part: قىسىم +Preface: كىرىش سۆز +Proof: ئىسپات +References: پايدىلانما +See: قاراڭ +SeeAlso: ئايرىم قاراڭ +Table: جەدۋەل +To: تاپشۇرۇۋالغۇچى diff --git a/data/translations/uk.yaml b/data/translations/uk.yaml --- a/data/translations/uk.yaml +++ b/data/translations/uk.yaml @@ -16,6 +16,6 @@ Proof: Доведення References: Література See: див. -SeeAlso: див. також +SeeAlso: див. також Table: Табл. To: До diff --git a/data/translations/ur.yaml b/data/translations/ur.yaml --- a/data/translations/ur.yaml +++ b/data/translations/ur.yaml @@ -1,22 +1,21 @@ -Abstract: ﻢﻠﺨّﺻ -Appendix: ﺾﻣیﻡہ -Bibliography: کﺕﺎﺑیﺎﺗ -Cc: ﻦﻘﻟ -Chapter: ﺏﺎﺑ -Contents: ﻑہﺮﺴﺗ ﻊﻧﻭﺎﻧﺎﺗ -Encl: ﻢﻨﺴﻟک -Figure: ﺶﻜﻟ -Glossary: ﻞﻐﺗ -Index: ﺎﺷﺍﺭیہ -ListOfFigures: ﻑہﺮﺴﺗ ﺎﺷکﺎﻟ -ListOfTables: ﻑہﺮﺴﺗ ﺝﺩﺍﻮﻟ -Page: ﺺﻔﺣہ -Part: ﺢﺻّہ -Preface: ﺩیﺏﺍچہ -Proof: ﺚﺑﻮﺗ -References: ﺡﻭﺎﻟہ ﺝﺎﺗ -Section: ﻒﺼﻟ -See: ﻡﻼﺤﻇہ ہﻭ -SeeAlso: ﺍیﺽﺍً -Table: ﺝﺩﻮﻟ -To: ﺐﻣﻼﺤﻇہ +Abstract: ملخّص +Appendix: ضمیمہ +Bibliography: کتابیات +Cc: نقل +Chapter: باب +Contents: فہرست عنوانات +Encl: منسلک +Figure: شكل +Glossary: لغت +Index: اشاریہ +ListOfFigures: فہرست اشکال +ListOfTables: فہرست جداول +Page: صفحہ +Part: حصّہ +Preface: دیباچہ +Proof: ثبوت +References: حوالہ جات +See: ملاحظہ ہو +SeeAlso: ایضاً +Table: جدول +To: بملاحظہ diff --git a/data/translations/vi.yaml b/data/translations/vi.yaml --- a/data/translations/vi.yaml +++ b/data/translations/vi.yaml @@ -1,21 +1,21 @@ Abstract: Tóm tắt nội dung -Also: Xem thêm Appendix: Phụ lục -Bib: Tài liệu tham khảo +Bibliography: Tài liệu tham khảo Cc: Cùng gửi Chapter: Chương Contents: Mục lục Encl: Kèm theo Figure: Hình Glossary: Từ điển chú giải -Headto: Gửi Index: Chỉ mục -Listfigure: Danh sách hình vẽ -Listtable: Danh sách bẳng +ListOfFigures: Danh sách hình vẽ +ListOfTables: Danh sách bảng Page: Trang Part: Phần Preface: Lời nói đầu Proof: Chứng minh References: Tài liệu See: Xem -Table: Bẳng +SeeAlso: Xem thêm +Table: Bảng +To: Gửi diff --git a/pandoc.cabal b/pandoc.cabal --- a/pandoc.cabal +++ b/pandoc.cabal @@ -1,6 +1,6 @@ cabal-version: 2.4 name: pandoc -version: 3.2.1 +version: 3.3 build-type: Simple license: GPL-2.0-or-later license-file: COPYING.md @@ -530,10 +530,10 @@ zip-archive >= 0.4.3.1 && < 0.5, zlib >= 0.5 && < 0.8, xml >= 1.3.12 && < 1.4, - typst >= 0.5.0.4 && < 0.5.1, + typst >= 0.5.0.5 && < 0.5.1, vector >= 0.12 && < 0.14, djot >= 0.1.2.1 && < 0.2, - tls >= 2.0.1 && < 2.1, + tls >= 2.0.1 && < 2.2, crypton-x509-system >= 1.6.7 && < 1.7 if !os(windows) diff --git a/src/Text/Pandoc/App/CommandLineOptions.hs b/src/Text/Pandoc/App/CommandLineOptions.hs --- a/src/Text/Pandoc/App/CommandLineOptions.hs +++ b/src/Text/Pandoc/App/CommandLineOptions.hs @@ -411,8 +411,11 @@ "" -- "Number of levels to include in TOC" , Option "N" ["number-sections"] - (NoArg - (\opt -> return opt { optNumberSections = True })) + (OptArg + (\arg opt -> do + boolValue <- readBoolFromOptArg "--number-sections/-N" arg + return opt { optNumberSections = boolValue }) + "true|false") "" -- "Number sections" , Option "" ["number-offset"] @@ -600,6 +603,14 @@ return opt { optEmbedResources = boolValue }) "true|false") "" -- "Make slide shows include all the needed js and css" + + , Option "" ["link-images"] -- maybe True (\argStr -> argStr == "true") arg + (OptArg + (\arg opt -> do + boolValue <- readBoolFromOptArg "--link-images" arg + return opt { optLinkImages = boolValue }) + "true|false") + "" -- "Link images in ODT rather than embedding them" , Option "" ["request-header"] (ReqArg diff --git a/src/Text/Pandoc/App/Opt.hs b/src/Text/Pandoc/App/Opt.hs --- a/src/Text/Pandoc/App/Opt.hs +++ b/src/Text/Pandoc/App/Opt.hs @@ -119,6 +119,7 @@ , optIncremental :: Bool -- ^ Use incremental lists in Slidy/Slideous/S5 , optSelfContained :: Bool -- ^ Make HTML accessible offline (deprecated) , optEmbedResources :: Bool -- ^ Make HTML accessible offline + , optLinkImages :: Bool -- ^ Link ODT images rather than embedding , optHtmlQTags :: Bool -- ^ Use tags in HTML , optHighlightStyle :: Maybe Text -- ^ Style to use for highlighted code , optSyntaxDefinitions :: [FilePath] -- ^ xml syntax defs to load @@ -201,6 +202,7 @@ <*> o .:? "incremental" .!= optIncremental defaultOpts <*> o .:? "self-contained" .!= optSelfContained defaultOpts <*> o .:? "embed-resources" .!= optEmbedResources defaultOpts + <*> o .:? "link-images" .!= optLinkImages defaultOpts <*> o .:? "html-q-tags" .!= optHtmlQTags defaultOpts <*> o .:? "highlight-style" <*> o .:? "syntax-definitions" .!= optSyntaxDefinitions defaultOpts @@ -526,6 +528,8 @@ parseJSON v >>= \x -> return (\o -> o{ optSelfContained = x }) "embed-resources" -> parseJSON v >>= \x -> return (\o -> o{ optEmbedResources = x }) + "link-images" -> + parseJSON v >>= \x -> return (\o -> o{ optLinkImages = x }) "html-q-tags" -> parseJSON v >>= \x -> return (\o -> o{ optHtmlQTags = x }) "highlight-style" -> @@ -738,6 +742,7 @@ , optIncremental = False , optSelfContained = False , optEmbedResources = False + , optLinkImages = False , optHtmlQTags = False , optHighlightStyle = Just "pygments" , optSyntaxDefinitions = [] diff --git a/src/Text/Pandoc/App/OutputSettings.hs b/src/Text/Pandoc/App/OutputSettings.hs --- a/src/Text/Pandoc/App/OutputSettings.hs +++ b/src/Text/Pandoc/App/OutputSettings.hs @@ -262,6 +262,7 @@ , writerReferenceDoc = optReferenceDoc opts , writerSyntaxMap = syntaxMap , writerPreferAscii = optAscii opts + , writerLinkImages = optLinkImages opts } return $ OutputSettings { outputFormat = format diff --git a/src/Text/Pandoc/Citeproc/BibTeX.hs b/src/Text/Pandoc/Citeproc/BibTeX.hs --- a/src/Text/Pandoc/Citeproc/BibTeX.hs +++ b/src/Text/Pandoc/Citeproc/BibTeX.hs @@ -206,7 +206,7 @@ renderName name = case nameLiteral name of - Just t -> B.text t + Just t -> B.spanWith ("",[],[]) $ B.text t Nothing -> spacedMaybes [ nameNonDroppingParticle name , nameFamily name diff --git a/src/Text/Pandoc/Filter/Environment.hs b/src/Text/Pandoc/Filter/Environment.hs --- a/src/Text/Pandoc/Filter/Environment.hs +++ b/src/Text/Pandoc/Filter/Environment.hs @@ -3,7 +3,7 @@ Copyright : ©2020-2021 Albert Krewinkel License : GNU GPL, version 2 or above - Maintainer : Albert Krewinkel + Maintainer : Albert Krewinkel Stability : alpha Portability : portable diff --git a/src/Text/Pandoc/Format.hs b/src/Text/Pandoc/Format.hs --- a/src/Text/Pandoc/Format.hs +++ b/src/Text/Pandoc/Format.hs @@ -4,7 +4,7 @@ Module : Text.Pandoc.Format Copyright : © 2022-2024 Albert Krewinkel License : GPL-2.0-or-later - Maintainer : Albert Krewinkel + Maintainer : Albert Krewinkel Handling of format specifiers for input and output. -} diff --git a/src/Text/Pandoc/Options.hs b/src/Text/Pandoc/Options.hs --- a/src/Text/Pandoc/Options.hs +++ b/src/Text/Pandoc/Options.hs @@ -325,6 +325,7 @@ , writerReferenceLocation :: ReferenceLocation -- ^ Location of footnotes and references for writing markdown , writerSyntaxMap :: SyntaxMap , writerPreferAscii :: Bool -- ^ Prefer ASCII representations of characters when possible + , writerLinkImages :: Bool -- ^ Use links rather than embedding ODT images } deriving (Show, Data, Typeable, Generic) instance Default WriterOptions where @@ -363,6 +364,7 @@ , writerReferenceLocation = EndOfDocument , writerSyntaxMap = defaultSyntaxMap , writerPreferAscii = False + , writerLinkImages = False } instance HasSyntaxExtensions WriterOptions where diff --git a/src/Text/Pandoc/Readers/HTML/Table.hs b/src/Text/Pandoc/Readers/HTML/Table.hs --- a/src/Text/Pandoc/Readers/HTML/Table.hs +++ b/src/Text/Pandoc/Readers/HTML/Table.hs @@ -7,7 +7,7 @@ 2020-2024 Albert Krewinkel License : GNU GPL, version 2 or above - Maintainer : Albert Krewinkel + Maintainer : Albert Krewinkel Stability : alpha Portability : portable diff --git a/src/Text/Pandoc/Readers/Haddock.hs b/src/Text/Pandoc/Readers/Haddock.hs --- a/src/Text/Pandoc/Readers/Haddock.hs +++ b/src/Text/Pandoc/Readers/Haddock.hs @@ -101,10 +101,9 @@ toRow = Row nullAttr . map B.simpleCell toHeaderRow l = [toRow l | not (null l)] (header, body) = - if null headerRows - then ([], map toCells bodyRows) - else (toCells (head headerRows), - map toCells (tail headerRows ++ bodyRows)) + case headerRows of + [] -> ([], map toCells bodyRows) + (x:xs) -> (toCells x, map toCells (xs ++ bodyRows)) colspecs = replicate (maybe 0 maximum (nonEmpty (map length body))) (AlignDefault, ColWidthDefault) in B.table B.emptyCaption diff --git a/src/Text/Pandoc/Readers/JATS.hs b/src/Text/Pandoc/Readers/JATS.hs --- a/src/Text/Pandoc/Readers/JATS.hs +++ b/src/Text/Pandoc/Readers/JATS.hs @@ -757,7 +757,9 @@ filterChildren (named "tex-math") whereToLook mathMLs = map mathML $ filterChildren isMathML whereToLook - return . para . head . take 1 . map constructor $ texMaths ++ mathMLs + case texMaths ++ mathMLs of + [] -> return mempty + (m:_) -> return $ para (constructor m) mathML :: Element -> Text mathML x = diff --git a/src/Text/Pandoc/Readers/Jira.hs b/src/Text/Pandoc/Readers/Jira.hs --- a/src/Text/Pandoc/Readers/Jira.hs +++ b/src/Text/Pandoc/Readers/Jira.hs @@ -5,7 +5,7 @@ Copyright : © 2019-2024 Albert Krewinkel License : GPL-2.0-or-later - Maintainer : Albert Krewinkel + Maintainer : Albert Krewinkel Conversion of jira wiki formatted plain text to 'Pandoc' document. -} diff --git a/src/Text/Pandoc/Readers/LaTeX/Lang.hs b/src/Text/Pandoc/Readers/LaTeX/Lang.hs --- a/src/Text/Pandoc/Readers/LaTeX/Lang.hs +++ b/src/Text/Pandoc/Readers/LaTeX/Lang.hs @@ -171,7 +171,7 @@ , ("indonesian", \_ -> simpleLang "id") , ("icelandic", \_ -> simpleLang "is") , ("italian", \_ -> simpleLang "it") - , ("japanese", \_ -> simpleLang "jp") + , ("japanese", \_ -> simpleLang "ja") , ("khmer", \_ -> simpleLang "km") , ("kurmanji", \_ -> simpleLang "kmr") , ("kannada", \_ -> simpleLang "kn") diff --git a/src/Text/Pandoc/Readers/Org.hs b/src/Text/Pandoc/Readers/Org.hs --- a/src/Text/Pandoc/Readers/Org.hs +++ b/src/Text/Pandoc/Readers/Org.hs @@ -3,7 +3,7 @@ Copyright : Copyright (C) 2014-2024 Albert Krewinkel License : GNU GPL, version 2 or above - Maintainer : Albert Krewinkel + Maintainer : Albert Krewinkel Conversion of org-mode formatted plain text to 'Pandoc' document. -} diff --git a/src/Text/Pandoc/Readers/Org/BlockStarts.hs b/src/Text/Pandoc/Readers/Org/BlockStarts.hs --- a/src/Text/Pandoc/Readers/Org/BlockStarts.hs +++ b/src/Text/Pandoc/Readers/Org/BlockStarts.hs @@ -4,7 +4,7 @@ Copyright : Copyright (C) 2014-2024 Albert Krewinkel License : GNU GPL, version 2 or above - Maintainer : Albert Krewinkel + Maintainer : Albert Krewinkel Parsers for Org-mode inline elements. -} diff --git a/src/Text/Pandoc/Readers/Org/Blocks.hs b/src/Text/Pandoc/Readers/Org/Blocks.hs --- a/src/Text/Pandoc/Readers/Org/Blocks.hs +++ b/src/Text/Pandoc/Readers/Org/Blocks.hs @@ -7,7 +7,7 @@ Copyright : Copyright (C) 2014-2024 Albert Krewinkel License : GNU GPL, version 2 or above - Maintainer : Albert Krewinkel + Maintainer : Albert Krewinkel Parsers for Org-mode block elements. -} diff --git a/src/Text/Pandoc/Readers/Org/DocumentTree.hs b/src/Text/Pandoc/Readers/Org/DocumentTree.hs --- a/src/Text/Pandoc/Readers/Org/DocumentTree.hs +++ b/src/Text/Pandoc/Readers/Org/DocumentTree.hs @@ -6,7 +6,7 @@ Copyright : Copyright (C) 2014-2024 Albert Krewinkel License : GNU GPL, version 2 or above - Maintainer : Albert Krewinkel + Maintainer : Albert Krewinkel Parsers for org-mode headlines and document subtrees -} diff --git a/src/Text/Pandoc/Readers/Org/ExportSettings.hs b/src/Text/Pandoc/Readers/Org/ExportSettings.hs --- a/src/Text/Pandoc/Readers/Org/ExportSettings.hs +++ b/src/Text/Pandoc/Readers/Org/ExportSettings.hs @@ -4,7 +4,7 @@ Copyright : © 2016-2024 Albert Krewinkel License : GNU GPL, version 2 or above - Maintainer : Albert Krewinkel + Maintainer : Albert Krewinkel Parsers for Org-mode export options. -} diff --git a/src/Text/Pandoc/Readers/Org/Inlines.hs b/src/Text/Pandoc/Readers/Org/Inlines.hs --- a/src/Text/Pandoc/Readers/Org/Inlines.hs +++ b/src/Text/Pandoc/Readers/Org/Inlines.hs @@ -5,7 +5,7 @@ Copyright : Copyright (C) 2014-2024 Albert Krewinkel License : GNU GPL, version 2 or above - Maintainer : Albert Krewinkel + Maintainer : Albert Krewinkel Parsers for Org-mode inline elements. -} diff --git a/src/Text/Pandoc/Readers/Org/Meta.hs b/src/Text/Pandoc/Readers/Org/Meta.hs --- a/src/Text/Pandoc/Readers/Org/Meta.hs +++ b/src/Text/Pandoc/Readers/Org/Meta.hs @@ -6,7 +6,7 @@ Copyright : Copyright (C) 2014-2024 Albert Krewinkel License : GNU GPL, version 2 or above - Maintainer : Albert Krewinkel + Maintainer : Albert Krewinkel Parsers for Org-mode meta declarations. -} diff --git a/src/Text/Pandoc/Readers/Org/ParserState.hs b/src/Text/Pandoc/Readers/Org/ParserState.hs --- a/src/Text/Pandoc/Readers/Org/ParserState.hs +++ b/src/Text/Pandoc/Readers/Org/ParserState.hs @@ -6,7 +6,7 @@ Copyright : Copyright (C) 2014-2024 Albert Krewinkel License : GNU GPL, version 2 or above - Maintainer : Albert Krewinkel + Maintainer : Albert Krewinkel Define the Org-mode parser state. -} diff --git a/src/Text/Pandoc/Readers/Org/Parsing.hs b/src/Text/Pandoc/Readers/Org/Parsing.hs --- a/src/Text/Pandoc/Readers/Org/Parsing.hs +++ b/src/Text/Pandoc/Readers/Org/Parsing.hs @@ -3,7 +3,7 @@ Copyright : Copyright (C) 2014-2024 Albert Krewinkel License : GNU GPL, version 2 or above - Maintainer : Albert Krewinkel + Maintainer : Albert Krewinkel Org-mode parsing utilities. diff --git a/src/Text/Pandoc/Readers/Org/Shared.hs b/src/Text/Pandoc/Readers/Org/Shared.hs --- a/src/Text/Pandoc/Readers/Org/Shared.hs +++ b/src/Text/Pandoc/Readers/Org/Shared.hs @@ -4,7 +4,7 @@ Copyright : Copyright (C) 2014-2024 Albert Krewinkel License : GNU GPL, version 2 or above - Maintainer : Albert Krewinkel + Maintainer : Albert Krewinkel Utility functions used in other Pandoc Org modules. -} diff --git a/src/Text/Pandoc/Readers/RTF.hs b/src/Text/Pandoc/Readers/RTF.hs --- a/src/Text/Pandoc/Readers/RTF.hs +++ b/src/Text/Pandoc/Readers/RTF.hs @@ -428,10 +428,12 @@ UnformattedText{} -> return () _ -> updateState $ \s -> s{ sEatChars = 0 } case tok' of - Grouped (Tok _ (ControlSymbol '*') : toks) -> - bs <$ (do oldTextContent <- sTextContent <$> getState - processTok mempty (Tok pos (Grouped toks)) - updateState $ \st -> st{ sTextContent = oldTextContent }) + Grouped (Tok _ (ControlSymbol '*') : toks@(firsttok:_)) -> + case firsttok of + Tok _ (ControlWord "shppict" _) -> inGroup (foldM processTok bs toks) + _ -> bs <$ (do oldTextContent <- sTextContent <$> getState + processTok mempty (Tok pos (Grouped toks)) + updateState $ \st -> st{ sTextContent = oldTextContent }) Grouped (Tok _ (ControlWord "fonttbl" _) : toks) -> inGroup $ do updateState $ \s -> s{ sFontTable = processFontTable toks } pure bs diff --git a/src/Text/Pandoc/Readers/TWiki.hs b/src/Text/Pandoc/Readers/TWiki.hs --- a/src/Text/Pandoc/Readers/TWiki.hs +++ b/src/Text/Pandoc/Readers/TWiki.hs @@ -16,7 +16,7 @@ import Control.Monad import Control.Monad.Except (throwError) -import Data.Char (isAlphaNum) +import Data.Char (isAlphaNum, isDigit, isUpper, isLower, isLetter) import qualified Data.Foldable as F import Data.Maybe (fromMaybe) import Data.Text (Text) @@ -222,9 +222,11 @@ (TableHead nullAttr $ toHeaderRow heads) [TableBody nullAttr 0 [] $ map toRow rows] (TableFoot nullAttr []) - align rows = replicate (columCount rows) (AlignDefault, ColWidthDefault) - columns rows = replicate (columCount rows) mempty - columCount rows = length $ head rows + align rows = replicate (columnCount rows) + (AlignDefault, ColWidthDefault) + columns rows = replicate (columnCount rows) mempty + columnCount (r:_) = length r + columnCount [] = 0 toRow = Row nullAttr . map B.simpleCell toHeaderRow l = [toRow l | not (null l)] @@ -467,7 +469,7 @@ st <- getState guard $ stateAllowLinks st setState $ st{ stateAllowLinks = False } - (url, title, content) <- linkText + (url, title, content) <- linkText <|> simpleWikiLink setState $ st{ stateAllowLinks = True } return $ B.link url title content @@ -481,3 +483,15 @@ where linkContent = char '[' >> many1Till anyChar (char ']') >>= parseLinkContent . T.pack parseLinkContent = parseFromString' $ many1 inline + +simpleWikiLink :: PandocMonad m => TWParser m (Text, Text, B.Inlines) +simpleWikiLink = do + w <- wikiWord + return (w, "wikilink", B.str w) + where + wikiWord = do + cs <- many1 $ satisfy (\x -> isLetter x && isUpper x) + ds <- many1 $ satisfy (\x -> isDigit x || (isLetter x && isLower x)) + es <- many1 $ satisfy (\x -> isLetter x && isUpper x) + fs <- many $ satisfy isAlphaNum + return $ T.pack $ cs ++ ds ++ es ++ fs diff --git a/src/Text/Pandoc/Readers/Typst.hs b/src/Text/Pandoc/Readers/Typst.hs --- a/src/Text/Pandoc/Readers/Typst.hs +++ b/src/Text/Pandoc/Readers/Typst.hs @@ -365,6 +365,8 @@ pure $ B.plain . B.text . mconcat . map toNum $ V.toList nums) ,("footnote.entry", \_ fields -> getField "body" fields >>= pWithContents pBlocks) + ,("pad", \_ fields -> -- ignore paddingy + getField "body" fields >>= pWithContents pBlocks) ] inlineHandlers :: PandocMonad m => @@ -499,6 +501,8 @@ body <- getField "body" fields display <- getField "block" fields (if display then B.displayMath else B.math) . writeTeX <$> pMathMany body) + ,("pad", \_ fields -> -- ignore paddingy + getField "body" fields >>= pWithContents pInlines) ] getInlineBody :: PandocMonad m => M.Map Identifier Val -> P m (Seq Content) diff --git a/src/Text/Pandoc/Scripting.hs b/src/Text/Pandoc/Scripting.hs --- a/src/Text/Pandoc/Scripting.hs +++ b/src/Text/Pandoc/Scripting.hs @@ -5,7 +5,7 @@ Module : Text.Pandoc.Scripting Copyright : © 2022-2024 Albert Krewinkel License : GPL-2.0-or-later -Maintainer : Albert Krewinkel +Maintainer : Albert Krewinkel Central data structure for scripting engines. -} diff --git a/src/Text/Pandoc/Writers/ConTeXt.hs b/src/Text/Pandoc/Writers/ConTeXt.hs --- a/src/Text/Pandoc/Writers/ConTeXt.hs +++ b/src/Text/Pandoc/Writers/ConTeXt.hs @@ -829,7 +829,6 @@ fromBCP47' (Just (Lang "el" _ _ _ _ _)) = Just "gr" fromBCP47' (Just (Lang "eu" _ _ _ _ _)) = Just "ba" fromBCP47' (Just (Lang "he" _ _ _ _ _)) = Just "il" -fromBCP47' (Just (Lang "jp" _ _ _ _ _)) = Just "ja" fromBCP47' (Just (Lang "uk" _ _ _ _ _)) = Just "ua" fromBCP47' (Just (Lang "vi" _ _ _ _ _)) = Just "vn" fromBCP47' (Just (Lang "zh" _ _ _ _ _)) = Just "cn" diff --git a/src/Text/Pandoc/Writers/DocBook.hs b/src/Text/Pandoc/Writers/DocBook.hs --- a/src/Text/Pandoc/Writers/DocBook.hs +++ b/src/Text/Pandoc/Writers/DocBook.hs @@ -251,10 +251,9 @@ blockToDocBook opts (CodeBlock (_,classes,_) str) = return $ literal (" lang <> ">") <> cr <> flush (literal (escapeStringForXML str) <> cr <> literal "") - where lang = if null langs - then "" - else " language=\"" <> escapeStringForXML (head langs) <> - "\"" + where lang = case langs of + [] -> "" + (l:_) -> " language=\"" <> escapeStringForXML l <> "\"" syntaxMap = writerSyntaxMap opts isLang l = T.toLower l `elem` map T.toLower (languages syntaxMap) langsFrom s = if isLang s diff --git a/src/Text/Pandoc/Writers/Docx.hs b/src/Text/Pandoc/Writers/Docx.hs --- a/src/Text/Pandoc/Writers/Docx.hs +++ b/src/Text/Pandoc/Writers/Docx.hs @@ -161,7 +161,7 @@ setattr _ _ x = x isEastAsianLang Lang{ langLanguage = lang } = - lang == "zh" || lang == "jp" || lang == "ko" + lang == "zh" || lang == "ja" || lang == "ko" isBidiLang Lang{ langLanguage = lang } = lang == "he" || lang == "ar" diff --git a/src/Text/Pandoc/Writers/Docx/OpenXML.hs b/src/Text/Pandoc/Writers/Docx/OpenXML.hs --- a/src/Text/Pandoc/Writers/Docx/OpenXML.hs +++ b/src/Text/Pandoc/Writers/Docx/OpenXML.hs @@ -25,7 +25,6 @@ import Control.Monad.Except (catchError) import qualified Data.ByteString.Lazy as BL import Data.Char (isLetter, isSpace) -import Data.Bifunctor (first) import Text.Pandoc.Char (isCJK) import Data.Ord (comparing) import Data.String (fromString) @@ -391,26 +390,21 @@ wrapBookmark tableId content blockToOpenXML' opts el | BulletList lst <- el - = case mapM toTaskListItem lst of - Just items -> addOpenXMLList (map (first (Just . CheckboxMarker)) items) - Nothing -> addOpenXMLList $ zip (Just BulletMarker : repeat Nothing) lst + = case mapM toTaskListItem lst of + Just items -> mconcat <$> + mapM (\(checked, bs) -> addOpenXMLList (CheckboxMarker checked) [bs]) items + Nothing -> addOpenXMLList BulletMarker lst | OrderedList (start, numstyle, numdelim) lst <- el - = addOpenXMLList $ - zip (Just (NumberMarker numstyle numdelim start) : repeat Nothing) lst + = addOpenXMLList (NumberMarker numstyle numdelim start) lst where - addOpenXMLList items = do - exampleid <- case items of - (Just (NumberMarker Example _ _),_) : _ -> gets stExampleId - _ -> return Nothing - l <- asList $ mconcat <$> - mapM (\(mbmarker, bs) -> do - numid <- case mbmarker of - Nothing -> getNumId - Just marker -> do - addList marker - getNumId - listItemToOpenXML opts (fromMaybe numid exampleid) bs) - items + addOpenXMLList marker items = do + addList marker + numid <- getNumId + exampleid <- case marker of + NumberMarker Example _ _ -> gets stExampleId + _ -> return Nothing + l <- asList $ concat <$> + mapM (listItemToOpenXML opts $ fromMaybe numid exampleid) items setFirstPara return l blockToOpenXML' opts (DefinitionList items) = do diff --git a/src/Text/Pandoc/Writers/GridTable.hs b/src/Text/Pandoc/Writers/GridTable.hs --- a/src/Text/Pandoc/Writers/GridTable.hs +++ b/src/Text/Pandoc/Writers/GridTable.hs @@ -8,7 +8,7 @@ Copyright : © 2020-2024 Albert Krewinkel License : GNU GPL, version 2 or above -Maintainer : Albert Krewinkel +Maintainer : Albert Krewinkel Grid representation of pandoc tables. The structures in this module allow to describe 'Text.Pandoc.Definition.Table' elements without loss diff --git a/src/Text/Pandoc/Writers/JATS/References.hs b/src/Text/Pandoc/Writers/JATS/References.hs --- a/src/Text/Pandoc/Writers/JATS/References.hs +++ b/src/Text/Pandoc/Writers/JATS/References.hs @@ -5,7 +5,7 @@ Copyright : © 2021-2024 Albert Krewinkel License : GNU GPL, version 2 or above - Maintainer : Albert Krewinkel + Maintainer : Albert Krewinkel Stability : alpha Portability : portable diff --git a/src/Text/Pandoc/Writers/JATS/Table.hs b/src/Text/Pandoc/Writers/JATS/Table.hs --- a/src/Text/Pandoc/Writers/JATS/Table.hs +++ b/src/Text/Pandoc/Writers/JATS/Table.hs @@ -6,7 +6,7 @@ Copyright : © 2020-2024 Albert Krewinkel License : GNU GPL, version 2 or above - Maintainer : Albert Krewinkel + Maintainer : Albert Krewinkel Stability : alpha Portability : portable diff --git a/src/Text/Pandoc/Writers/Jira.hs b/src/Text/Pandoc/Writers/Jira.hs --- a/src/Text/Pandoc/Writers/Jira.hs +++ b/src/Text/Pandoc/Writers/Jira.hs @@ -6,7 +6,7 @@ Copyright : © 2010-2024 Albert Krewinkel, John MacFarlane License : GNU GPL, version 2 or above - Maintainer : Albert Krewinkel + Maintainer : Albert Krewinkel Stability : alpha Portability : portable diff --git a/src/Text/Pandoc/Writers/ODT.hs b/src/Text/Pandoc/Writers/ODT.hs --- a/src/Text/Pandoc/Writers/ODT.hs +++ b/src/Text/Pandoc/Writers/ODT.hs @@ -24,7 +24,7 @@ import qualified Data.Text as T import qualified Data.Text.Lazy as TL import Data.Time -import System.FilePath (takeDirectory, takeExtension, (<.>)) +import System.FilePath (takeDirectory, takeExtension, (<.>), (), isAbsolute) import Text.Collate.Lang (Lang (..), renderLang) import Text.Pandoc.Class.PandocMonad (PandocMonad, report, toLang) import qualified Text.Pandoc.Class.PandocMonad as P @@ -48,7 +48,7 @@ import Text.Pandoc.XML.Light import Text.TeXMath import qualified Text.XML.Light as XL -import Network.URI (parseRelativeReference, URI(uriPath)) +import Network.URI (parseRelativeReference, URI(uriPath), isURI) import Skylighting newtype ODTState = ODTState { stEntries :: [Entry] @@ -272,15 +272,23 @@ Just dim -> Just $ Inch $ inInch opts dim Nothing -> Nothing let newattr = (id', cls, dims) - entries <- gets stEntries - let extension = maybe (takeExtension $ takeWhile (/='?') $ T.unpack src) T.unpack - (mbMimeType >>= extensionFromMimeType) - let newsrc = "Pictures/" ++ show (length entries) <.> extension - let toLazy = B.fromChunks . (:[]) - epochtime <- floor `fmap` lift P.getPOSIXTime - let entry = toEntry newsrc epochtime $ toLazy img - modify $ \st -> st{ stEntries = entry : entries } - return $ Image newattr lab (T.pack newsrc, t)) + src' <- if writerLinkImages opts + then + case T.unpack src of + s | isURI s -> return src + | isAbsolute s -> return src + | otherwise -> return $ T.pack $ ".." s + else do + entries <- gets stEntries + let extension = maybe (takeExtension $ takeWhile (/='?') $ T.unpack src) T.unpack + (mbMimeType >>= extensionFromMimeType) + let newsrc = "Pictures/" ++ show (length entries) <.> extension + let toLazy = B.fromChunks . (:[]) + epochtime <- floor `fmap` lift P.getPOSIXTime + let entry = toEntry newsrc epochtime $ toLazy img + modify $ \st -> st{ stEntries = entry : entries } + return $ T.pack newsrc + return $ Image newattr lab (src', t)) (\e -> do report $ CouldNotFetchResource src $ T.pack (show e) return $ Emph lab) diff --git a/src/Text/Pandoc/Writers/Org.hs b/src/Text/Pandoc/Writers/Org.hs --- a/src/Text/Pandoc/Writers/Org.hs +++ b/src/Text/Pandoc/Writers/Org.hs @@ -4,10 +4,10 @@ Module : Text.Pandoc.Writers.Org Copyright : © 2010-2015 Puneeth Chaganti 2010-2024 John MacFarlane - 2016-2024 Albert Krewinkel + 2016-2024 Albert Krewinkel License : GNU GPL, version 2 or above - Maintainer : Albert Krewinkel + Maintainer : Albert Krewinkel Stability : alpha Portability : portable diff --git a/test/Tests/Readers/Jira.hs b/test/Tests/Readers/Jira.hs --- a/test/Tests/Readers/Jira.hs +++ b/test/Tests/Readers/Jira.hs @@ -5,7 +5,7 @@ Copyright : © 2019-2024 Albert Krewinel License : GNU GPL, version 2 or above - Maintainer : Albert Krewinkel + Maintainer : Albert Krewinkel Stability : alpha Portability : portable diff --git a/test/Tests/Readers/Org.hs b/test/Tests/Readers/Org.hs --- a/test/Tests/Readers/Org.hs +++ b/test/Tests/Readers/Org.hs @@ -4,7 +4,7 @@ Copyright : © 2014-2024 Albert Krewinkel License : GNU GPL, version 2 or above - Maintainer : Albert Krewinkel + Maintainer : Albert Krewinkel Stability : alpha Portability : portable diff --git a/test/Tests/Readers/Org/Block.hs b/test/Tests/Readers/Org/Block.hs --- a/test/Tests/Readers/Org/Block.hs +++ b/test/Tests/Readers/Org/Block.hs @@ -4,7 +4,7 @@ Copyright : © 2014-2024 Albert Krewinkel License : GNU GPL, version 2 or above - Maintainer : Albert Krewinkel + Maintainer : Albert Krewinkel Stability : alpha Portability : portable diff --git a/test/Tests/Readers/Org/Block/CodeBlock.hs b/test/Tests/Readers/Org/Block/CodeBlock.hs --- a/test/Tests/Readers/Org/Block/CodeBlock.hs +++ b/test/Tests/Readers/Org/Block/CodeBlock.hs @@ -4,7 +4,7 @@ Copyright : © 2014-2024 Albert Krewinkel License : GNU GPL, version 2 or above - Maintainer : Albert Krewinkel + Maintainer : Albert Krewinkel Stability : alpha Portability : portable diff --git a/test/Tests/Readers/Org/Block/Figure.hs b/test/Tests/Readers/Org/Block/Figure.hs --- a/test/Tests/Readers/Org/Block/Figure.hs +++ b/test/Tests/Readers/Org/Block/Figure.hs @@ -4,7 +4,7 @@ Copyright : © 2014-2024 Albert Krewinkel License : GNU GPL, version 2 or above - Maintainer : Albert Krewinkel + Maintainer : Albert Krewinkel Stability : alpha Portability : portable diff --git a/test/Tests/Readers/Org/Block/Header.hs b/test/Tests/Readers/Org/Block/Header.hs --- a/test/Tests/Readers/Org/Block/Header.hs +++ b/test/Tests/Readers/Org/Block/Header.hs @@ -4,7 +4,7 @@ Copyright : © 2014-2024 Albert Krewinkel License : GNU GPL, version 2 or above - Maintainer : Albert Krewinkel + Maintainer : Albert Krewinkel Stability : alpha Portability : portable diff --git a/test/Tests/Readers/Org/Block/List.hs b/test/Tests/Readers/Org/Block/List.hs --- a/test/Tests/Readers/Org/Block/List.hs +++ b/test/Tests/Readers/Org/Block/List.hs @@ -4,7 +4,7 @@ Copyright : © 2014-2024 Albert Krewinkel License : GNU GPL, version 2 or above - Maintainer : Albert Krewinkel + Maintainer : Albert Krewinkel Stability : alpha Portability : portable diff --git a/test/Tests/Readers/Org/Block/Table.hs b/test/Tests/Readers/Org/Block/Table.hs --- a/test/Tests/Readers/Org/Block/Table.hs +++ b/test/Tests/Readers/Org/Block/Table.hs @@ -4,7 +4,7 @@ Copyright : © 2014-2024 Albert Krewinkel License : GNU GPL, version 2 or above - Maintainer : Albert Krewinkel + Maintainer : Albert Krewinkel Stability : alpha Portability : portable diff --git a/test/Tests/Readers/Org/Directive.hs b/test/Tests/Readers/Org/Directive.hs --- a/test/Tests/Readers/Org/Directive.hs +++ b/test/Tests/Readers/Org/Directive.hs @@ -4,7 +4,7 @@ Copyright : © 2014-2024 Albert Krewinkel License : GNU GPL, version 2 or above - Maintainer : Albert Krewinkel + Maintainer : Albert Krewinkel Stability : alpha Portability : portable diff --git a/test/Tests/Readers/Org/Inline.hs b/test/Tests/Readers/Org/Inline.hs --- a/test/Tests/Readers/Org/Inline.hs +++ b/test/Tests/Readers/Org/Inline.hs @@ -4,7 +4,7 @@ Copyright : © 2014-2024 Albert Krewinkel License : GNU GPL, version 2 or above - Maintainer : Albert Krewinkel + Maintainer : Albert Krewinkel Stability : alpha Portability : portable diff --git a/test/Tests/Readers/Org/Inline/Citation.hs b/test/Tests/Readers/Org/Inline/Citation.hs --- a/test/Tests/Readers/Org/Inline/Citation.hs +++ b/test/Tests/Readers/Org/Inline/Citation.hs @@ -4,7 +4,7 @@ Copyright : © 2014-2024 Albert Krewinkel License : GNU GPL, version 2 or above - Maintainer : Albert Krewinkel + Maintainer : Albert Krewinkel Stability : alpha Portability : portable diff --git a/test/Tests/Readers/Org/Inline/Note.hs b/test/Tests/Readers/Org/Inline/Note.hs --- a/test/Tests/Readers/Org/Inline/Note.hs +++ b/test/Tests/Readers/Org/Inline/Note.hs @@ -4,7 +4,7 @@ Copyright : © 2014-2024 Albert Krewinkel License : GNU GPL, version 2 or above - Maintainer : Albert Krewinkel + Maintainer : Albert Krewinkel Stability : alpha Portability : portable diff --git a/test/Tests/Readers/Org/Inline/Smart.hs b/test/Tests/Readers/Org/Inline/Smart.hs --- a/test/Tests/Readers/Org/Inline/Smart.hs +++ b/test/Tests/Readers/Org/Inline/Smart.hs @@ -4,7 +4,7 @@ Copyright : © 2014-2024 Albert Krewinkel License : GNU GPL, version 2 or above - Maintainer : Albert Krewinkel + Maintainer : Albert Krewinkel Stability : alpha Portability : portable diff --git a/test/Tests/Readers/Org/Meta.hs b/test/Tests/Readers/Org/Meta.hs --- a/test/Tests/Readers/Org/Meta.hs +++ b/test/Tests/Readers/Org/Meta.hs @@ -4,7 +4,7 @@ Copyright : © 2014-2024 Albert Krewinkel License : GNU GPL, version 2 or above - Maintainer : Albert Krewinkel + Maintainer : Albert Krewinkel Stability : alpha Portability : portable diff --git a/test/Tests/Readers/Org/Shared.hs b/test/Tests/Readers/Org/Shared.hs --- a/test/Tests/Readers/Org/Shared.hs +++ b/test/Tests/Readers/Org/Shared.hs @@ -4,7 +4,7 @@ Copyright : © 2014-2024 Albert Krewinkel License : GNU GPL, version 2 or above - Maintainer : Albert Krewinkel + Maintainer : Albert Krewinkel Stability : alpha Portability : portable diff --git a/test/Tests/Writers/Docx.hs b/test/Tests/Writers/Docx.hs --- a/test/Tests/Writers/Docx.hs +++ b/test/Tests/Writers/Docx.hs @@ -103,6 +103,11 @@ "docx/task_list.native" "docx/golden/task_list.docx" , docxTest + "issue 9994" + def + "docx/lists_9994.native" + "docx/golden/lists_9994.docx" + , docxTest "footnotes and endnotes" def "docx/notes.native" diff --git a/test/command/9943.md b/test/command/9943.md new file mode 100644 --- /dev/null +++ b/test/command/9943.md @@ -0,0 +1,24 @@ +``` +% pandoc -t man -s -Vpandoc-version=X.Y +--- +title: HELLO +section: 1 +--- +^D +.\" Automatically generated by Pandoc X.Y +.\" +.TH "HELLO" "1" "" "" +``` + +``` +% pandoc -t man -s -Vpandoc-version=X.Y +--- +title: HELLO +section: 1 +header: Head +--- +^D +.\" Automatically generated by Pandoc X.Y +.\" +.TH "HELLO" "1" "" "" "Head" +``` diff --git a/test/command/9987.md b/test/command/9987.md new file mode 100644 --- /dev/null +++ b/test/command/9987.md @@ -0,0 +1,10 @@ +``` +% pandoc -f bibtex -t bibtex +@misc{agency, + author = {{European Environment Agency}}, +} +^D +@misc{agency, + author = {{European Environment Agency}} +} +``` diff --git a/test/command/translations.md b/test/command/translations.md --- a/test/command/translations.md +++ b/test/command/translations.md @@ -21,7 +21,7 @@ ``` ``` -% pandoc -f latex -t native -M lang=sr +% pandoc -f latex -t native -M lang=sr-Latn \figurename~2 \figurename. ^D diff --git a/test/docx/golden/lists.docx b/test/docx/golden/lists.docx Binary files a/test/docx/golden/lists.docx and b/test/docx/golden/lists.docx differ diff --git a/test/docx/golden/lists_9994.docx b/test/docx/golden/lists_9994.docx new file mode 100644 Binary files /dev/null and b/test/docx/golden/lists_9994.docx differ diff --git a/test/docx/lists_9994.native b/test/docx/lists_9994.native new file mode 100644 --- /dev/null +++ b/test/docx/lists_9994.native @@ -0,0 +1,8 @@ +[ OrderedList + ( 1 , Decimal , Period ) + [ [ Plain [ Str "one" ] + , BulletList [ [ Plain [ Str "bul" ] ] ] + ] + , [ Plain [ Str "two" ] ] + ] +] diff --git a/test/twiki-reader.native b/test/twiki-reader.native --- a/test/twiki-reader.native +++ b/test/twiki-reader.native @@ -149,6 +149,22 @@ , Para [ Str "Nother" , Space , Str "paragraph." ] , Header 1 + ( "internal-links" , [] , [] ) + [ Str "internal" , Space , Str "links" ] + , Para + [ Link + ( "" , [] , [] ) + [ Str "MySimplePage" ] + ( "MySimplePage" , "wikilink" ) + ] + , Para + [ Link + ( "" , [] , [] ) + [ Str "My23Page23" ] + ( "My23Page23" , "wikilink" ) + ] + , Header + 1 ( "external-links" , [] , [] ) [ Str "external" , Space , Str "links" ] , Para diff --git a/test/twiki-reader.twiki b/test/twiki-reader.twiki --- a/test/twiki-reader.twiki +++ b/test/twiki-reader.twiki @@ -93,6 +93,12 @@ Nother paragraph. +---+ internal links + +MySimplePage + +My23Page23 + ---+ external links [[http://google.com][Google search engine]] diff --git a/test/writer.man b/test/writer.man --- a/test/writer.man +++ b/test/writer.man @@ -1,4 +1,4 @@ -.TH "Pandoc Test Suite" "" "July 17, 2006" "" "" +.TH "Pandoc Test Suite" "" "July 17, 2006" "" .PP This is a set of tests for pandoc. Most of them are adapted from John Gruber\[cq]s markdown test suite.