diff options
| -rw-r--r-- | data/doc/sisu/CHANGELOG_v7 | 9 | ||||
| -rw-r--r-- | data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim | 4 | ||||
| -rw-r--r-- | data/sisu/version.yml | 6 | ||||
| -rw-r--r-- | lib/sisu/texpdf_format.rb | 189 | ||||
| -rw-r--r-- | setup/sisu_version.rb | 2 |
5 files changed, 146 insertions, 64 deletions
diff --git a/data/doc/sisu/CHANGELOG_v7 b/data/doc/sisu/CHANGELOG_v7 index 0258f4f9..5ec1b588 100644 --- a/data/doc/sisu/CHANGELOG_v7 +++ b/data/doc/sisu/CHANGELOG_v7 @@ -20,6 +20,15 @@ Reverse Chronological: --- HEAD --- +* sisu_7.1.10.orig.tar.xz (2017-07-02:26/7) + http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_7.1.10 + + * sisu.vim (syntax highlighting) back reference related fix, + (provided by Bram Moolenaar) + + * texpf_format (debian texlive packages for usepackage .sty) + (notes update) + * sisu_7.1.9.orig.tar.xz (2016-07-31:30/7) http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_7.1.9 diff --git a/data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim b/data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim index 0e0f2dbe..effa9df7 100644 --- a/data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim +++ b/data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim @@ -1,7 +1,7 @@ " SiSU Vim syntax file " SiSU Maintainer: Ralph Amissah <ralph.amissah@gmail.com> " SiSU Markup: SiSU (sisu-5.6.7) -" Last Change: 2014-09-14 +" Last Change: 2017-06-22 " URL: <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim;hb=HEAD> " <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob_plain;f=data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim;hb=HEAD> "(originally looked at Ruby Vim by Mirko Nasato) @@ -104,7 +104,7 @@ syn region sisu_content_alt contains=sisu_strikeout,sisu_number,sisu_bold,sisu_c syn region sisu_content_alt contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_contain start="^```\s\+table" end="^```\(\s\|$\)" syn region sisu_content_alt contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_contain start="^{\(t\|table\)\(\~h\)\?\(\sc[0-9]\+;\)\?[0-9; ]*}" end="\n$" " block, group, poem, alt -syn region sisu_content_alt contains=sisu_mark_endnote,sisu_content_endnote,sisu_link,sisu_mark,sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_contain start="^\(block\|group\|poem\|alt\){" end="^}\1" +syn region sisu_content_alt contains=sisu_mark_endnote,sisu_content_endnote,sisu_link,sisu_mark,sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_contain start="^\z(block\|group\|poem\|alt\){" end="^}\z1" syn region sisu_content_alt contains=sisu_mark_endnote,sisu_content_endnote,sisu_link,sisu_mark,sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_contain start="^```\s\+\(block\|group\|poem\|alt\)" end="^```\(\s\|$\)" " box syn region sisu_content_alt contains=sisu_mark_endnote,sisu_content_endnote,sisu_link,sisu_mark,sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_contain start="^box\(\.[a-z]\+\)\?{" end="^}box" diff --git a/data/sisu/version.yml b/data/sisu/version.yml index bf9746f6..67b4f804 100644 --- a/data/sisu/version.yml +++ b/data/sisu/version.yml @@ -1,5 +1,5 @@ --- :project: SiSU -:version: 7.1.9 -:date_stamp: 2016w30/7 -:date: "2016-07-31" +:version: 7.1.10 +:date_stamp: 2017w26/7 +:date: "2017-07-02" diff --git a/lib/sisu/texpdf_format.rb b/lib/sisu/texpdf_format.rb index 9f938738..5549a245 100644 --- a/lib/sisu/texpdf_format.rb +++ b/lib/sisu/texpdf_format.rb @@ -1610,78 +1610,151 @@ Generated by \\href{http://www.jus.uio.no/sisu}{SiSU www.jus.uio.no/sisu } \\\\ end end __END__ -#ack usepackage texpdf* -#ack usepackage texpdf* |ack '\{.+?\}' -#see sisu_texpdf_usepackage.rb - alltt.sty +ag usepackage texpdf* +ag usepackage texpdf* | ag '\{.+?\}' +# texpdf_format.rb +ag usepackage texpdf* | ag --only-matching '\{.+?\}' + +* sort & make unique +@tex2pdf +alltt.sty +amssymb.sty +babel.sty +boites.sty +breakurl.sty +color.sty +endnotes.sty +fancyhdr.sty +fontspec.sty +footmisc.sty +graphicx.sty +inputenc.sty +listings.sty +longtable.sty +manyfoot.sty +mathptmx.sty +multicol.sty +parskip.sty +polyglossia.sty +soul.sty +textcomp.sty +thumbpdf.sty +titlepic.sty +ucs.sty +ulem.sty +url.sty +xeCJK.sty +xltxtra.sty +xunicode.sty + +* debian related +** found in + +alltt.sty + texlive-latex-base: /usr/share/texlive/texmf-dist/tex/latex/base/alltt.sty +amssymb.sty + texlive-base: /usr/share/texlive/texmf-dist/tex/latex/amsfonts/amssymb.sty +babel.sty + texlive-latex-base: /usr/share/texlive/texmf-dist/tex/generic/babel/babel.sty +boites.sty + texlive-latex-extra: /usr/share/texlive/texmf-dist/tex/latex/boites/boites.sty +breakurl.sty + texlive-latex-extra: /usr/share/texlive/texmf-dist/tex/latex/breakurl/breakurl.sty +color.sty + texlive-latex-base: /usr/share/texlive/texmf-dist/tex/latex/graphics/color.sty +endnotes.sty + texlive-latex-extra: /usr/share/texlive/texmf-dist/tex/latex/endnotes/endnotes.sty +fancyhdr.sty + texlive-latex-base: /usr/share/texlive/texmf-dist/tex/latex/fancyhdr/fancyhdr.sty +fontspec.sty + texlive-latex-recommended: /usr/share/texlive/texmf-dist/tex/latex/fontspec/fontspec.sty +footmisc.sty + texlive-latex-extra: /usr/share/texlive/texmf-dist/tex/latex/footmisc/footmisc.sty +graphicx.sty + texlive-latex-base: /usr/share/texlive/texmf-dist/tex/latex/graphics/graphicx.sty +inputenc.sty + texlive-latex-base: /usr/share/texlive/texmf-dist/tex/latex/base/inputenc.sty +listings.sty + texlive-latex-recommended: /usr/share/texlive/texmf-dist/tex/latex/listings/listings.sty +longtable.sty + texlive-latex-base: /usr/share/texlive/texmf-dist/tex/latex/tools/longtable.sty +manyfoot.sty + texlive-latex-extra: /usr/share/texlive/texmf-dist/tex/latex/ncctools/manyfoot.sty +mathptmx.sty + texlive-font-utils: /usr/share/doc/texlive-doc/fonts/fontinst/examples/mathptmx/mathptmx.sty + texlive-latex-base: /usr/share/texlive/texmf-dist/tex/latex/psnfss/mathptmx.sty +multicol.sty + ptex-jtex: /usr/share/texmf/ajtex/multicol.sty + texlive-latex-base: /usr/share/texlive/texmf-dist/tex/latex/tools/multicol.sty +parskip.sty + texlive-latex-recommended: /usr/share/texlive/texmf-dist/tex/latex/parskip/parskip.sty +polyglossia.sty + texlive-latex-recommended: /usr/share/texlive/texmf-dist/tex/latex/polyglossia/polyglossia.sty +soul.sty + texlive-latex-extra: /usr/share/texlive/texmf-dist/tex/latex/soul/soul.sty +textcomp.sty + texlive-latex-base: /usr/share/texlive/texmf-dist/tex/latex/base/textcomp.sty +thumbpdf.sty + texlive-latex-recommended: /usr/share/texlive/texmf-dist/tex/generic/thumbpdf/thumbpdf.sty +titlepic.sty + texlive-latex-extra: /usr/share/texlive/texmf-dist/tex/latex/titlepic/titlepic.sty +ucs.sty + texlive-latex-extra: /usr/share/texlive/texmf-dist/tex/latex/ucs/ucs.sty +ulem.sty + texlive-plain-generic: /usr/share/texlive/texmf-dist/tex/generic/ulem/ulem.sty +url.sty + texlive-latex-base: /usr/share/texlive/texmf-dist/tex/latex/url/url.sty +xeCJK.sty + texlive-xetex: /usr/share/texlive/texmf-dist/tex/xelatex/xecjk/xeCJK.sty +xltxtra.sty + texlive-latex-recommended: /usr/share/texlive/texmf-dist/tex/latex/xltxtra/xltxtra.sty +xunicode.sty + texlive-latex-recommended: /usr/share/texlive/texmf-dist/tex/xelatex/xunicode/xunicode.sty + +** belongs to + +texlive-base: amssymb.sty +texlive-latex-base: + alltt.sty babel.sty - boites.sty color.sty - endnotes.sty fancyhdr.sty - fontspec.sty - footmisc.sty graphicx.sty inputenc.sty - listings.sty longtable.sty - manyfoot.sty + mathptmx.sty multicol.sty - parskip.sty - polyglossia.sty - soul.sty textcomp.sty - thumbpdf.sty + url.sty +texlive-latex-extra: + boites.sty + breakurl.sty + endnotes.sty + footmisc.sty + manyfoot.sty + soul.sty titlepic.sty ucs.sty - ulem.sty - url.sty - xetex.sty +texlive-latex-recommended: + fontspec.sty + listings.sty + parskip.sty + polyglossia.sty + thumbpdf.sty xltxtra.sty xunicode.sty ---- -texlive-latex-base +texlive-plain-generic: + ulem.sty +texlive-xetex: + xeCJK.sty + +** all texlive packages used + texlive-base +texlive-latex-base texlive-latex-extra texlive-latex-recommended +texlive-plain-generic texlive-xetex -texlive-generic-recommended ---- -texlive-latex-base: - /usr/share/texlive/texmf-dist/tex/generic/babel/babel.sty - /usr/share/texlive/texmf-dist/tex/latex/base/alltt.sty - /usr/share/texlive/texmf-dist/tex/latex/base/inputenc.sty - /usr/share/texlive/texmf-dist/tex/latex/base/textcomp.sty - /usr/share/texlive/texmf-dist/tex/latex/fancyhdr/fancyhdr.sty - /usr/share/texlive/texmf-dist/tex/latex/graphics/color.sty - /usr/share/texlive/texmf-dist/tex/latex/graphics/graphicx.sty - /usr/share/texlive/texmf-dist/tex/latex/tools/longtable.sty - /usr/share/texlive/texmf-dist/tex/latex/tools/multicol.sty ---- -texlive-base: - /usr/share/texlive/texmf-dist/tex/latex/amsfonts/amssymb.sty ---- -texlive-latex-extra: - /usr/share/texlive/texmf-dist/tex/latex/boites/boites.sty - /usr/share/texlive/texmf-dist/tex/latex/endnotes/endnotes.sty - /usr/share/texlive/texmf-dist/tex/latex/footmisc/footmisc.sty - /usr/share/texlive/texmf-dist/tex/latex/ncctools/manyfoot.sty - /usr/share/texlive/texmf-dist/tex/latex/soul/soul.sty - /usr/share/texlive/texmf-dist/tex/latex/titlepic/titlepic.sty - /usr/share/texlive/texmf-dist/tex/latex/ucs/ucs.sty ---- -texlive-latex-recommended: - /usr/share/texlive/texmf-dist/tex/generic/thumbpdf/thumbpdf.sty - /usr/share/texlive/texmf-dist/tex/latex/fontspec/fontspec.sty - /usr/share/texlive/texmf-dist/tex/latex/listings/listings.sty - /usr/share/texlive/texmf-dist/tex/latex/parskip/parskip.sty - /usr/share/texlive/texmf-dist/tex/latex/url/url.sty ---- -texlive-xetex: - /usr/share/texlive/texmf-dist/tex/latex/xltxtra/xltxtra.sty - /usr/share/texlive/texmf-dist/tex/xelatex/polyglossia/polyglossia.sty - /usr/share/texlive/texmf-dist/tex/xelatex/xunicode/xunicode.sty ---- -texlive-generic-recommended: - /usr/share/texlive/texmf-dist/tex/generic/ulem/ulem.sty + diff --git a/setup/sisu_version.rb b/setup/sisu_version.rb index 35e335af..c361825d 100644 --- a/setup/sisu_version.rb +++ b/setup/sisu_version.rb @@ -1,6 +1,6 @@ #% constants module SiSUversion - SiSU_version = '7.1.9' + SiSU_version = '7.1.10' end module Dev GPGpubKey = '1BB4B289' |