Hello community,
here is the log from the commit of package texlive-specs-s for openSUSE:Factory checked in at 2017-06-25 19:22:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/texlive-specs-s (Old)
and /work/SRC/openSUSE:Factory/.texlive-specs-s.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "texlive-specs-s"
Sun Jun 25 19:22:30 2017 rev:26 rq:504809 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/texlive-specs-s/texlive-specs-s.changes 2017-06-08 14:56:04.141740750 +0200
+++ /work/SRC/openSUSE:Factory/.texlive-specs-s.new/texlive-specs-s.changes 2017-06-25 19:28:17.288099062 +0200
@@ -1,0 +2,42 @@
+Mon Jun 19 13:31:54 UTC 2017 - werner@suse.de
+
+- Fix texlive-pdftex-def dependency as now texlive-graphics-def does
+ provide pdftex.def
+- Fix texlive-rotating dependency as now texlive-graphics does
+ provide rotating.sty
+
+-------------------------------------------------------------------
+Fri Jun 16 12:14:49 UTC 2017 - werner@suse.de
+
+- Notive: Some patches have been moved
+ * bbold_bbold11.dif from texlive-specs-b to texlive-specs-c
+ * context_fourier-map.dif from texlive-specs-e to texlive-specs-f
+ * dvips_config.dif from texlive-specs-g to texlive-specs-h
+ * jadetex_ini.dif from texlive-specs-l to texlive-specs-m
+ * texdoc_cnf.dif from texlive-specs-v to texlive-specs-w
+ * texdraw_info.dif from texlive-specs-v to texlive-specs-w
+ this entry exists only to silent the auto factory bot
+
+-------------------------------------------------------------------
+Tue Jun 13 10:38:52 UTC 2017 - werner@suse.de
+
+- Final TeXLive 2017 20170520
+- Remove patch fontspec_emph.dif as now upstream
+- Update patches
+ * kpathsea_cnf.dif
+ * latex2man_tmphandling.dif
+ * latexdiff_perl.dif
+ * latexpand_perl.dif
+ * luaotfload_varfonts.dif
+ * luatex_cnf.dif
+ * musixtex_various.dif
+ * tetex_scripts.dif
+ * tex4ht_env.dif
+ * texconfig_scripts.dif
+
+-------------------------------------------------------------------
+Thu Jun 1 12:29:31 UTC 2017 - werner@suse.de
+
+- Update to TeXLive 2017 20170520 pretest
+
+-------------------------------------------------------------------
Old:
----
pst-ovl.doc.tar.xz
pst-ovl.tar.xz
pst-pad.doc.tar.xz
pst-pad.tar.xz
pst-pdf.doc.tar.xz
pst-pdf.tar.xz
pst-pdgr.doc.tar.xz
pst-pdgr.tar.xz
pst-perspective.doc.tar.xz
pst-perspective.tar.xz
pst-platon.doc.tar.xz
pst-platon.tar.xz
pst-plot.doc.tar.xz
pst-plot.tar.xz
pst-poly.doc.tar.xz
pst-poly.tar.xz
pst-pulley.doc.tar.xz
pst-pulley.tar.xz
pst-qtree.doc.tar.xz
pst-qtree.tar.xz
pst-rubans.doc.tar.xz
pst-rubans.tar.xz
pst-sigsys.doc.tar.xz
pst-sigsys.tar.xz
pst-slpe.doc.tar.xz
pst-slpe.tar.xz
pst-solarsystem.doc.tar.xz
pst-solarsystem.tar.xz
pst-solides3d.doc.tar.xz
pst-solides3d.tar.xz
pst-soroban.doc.tar.xz
pst-soroban.tar.xz
pst-spectra.doc.tar.xz
pst-spectra.tar.xz
pst-spirograph.doc.tar.xz
pst-spirograph.tar.xz
pst-stru.doc.tar.xz
pst-stru.tar.xz
pst-support.doc.tar.xz
pst-text.doc.tar.xz
pst-text.tar.xz
pst-thick.doc.tar.xz
pst-thick.tar.xz
pst-tools.doc.tar.xz
pst-tools.tar.xz
pst-tree.doc.tar.xz
pst-tree.tar.xz
pst-tvz.doc.tar.xz
pst-tvz.tar.xz
pst-uml.doc.tar.xz
pst-uml.tar.xz
pst-vectorian.doc.tar.xz
pst-vectorian.tar.xz
pst-vowel.doc.tar.xz
pst-vowel.tar.xz
pst-vue3d.doc.tar.xz
pst-vue3d.tar.xz
pst2pdf.doc.tar.xz
pst2pdf.tar.xz
pstool.doc.tar.xz
pstool.tar.xz
pstools.doc.tar.xz
pstools.tar.xz
pstricks-add.doc.tar.xz
pstricks-add.tar.xz
pstricks-examples-en.doc.tar.xz
pstricks-examples.doc.tar.xz
pstricks.doc.tar.xz
pstricks.tar.xz
pstricks_calcnotes.doc.tar.xz
psu-thesis.doc.tar.xz
psu-thesis.tar.xz
ptex-base.doc.tar.xz
ptex-base.tar.xz
ptex-fonts.doc.tar.xz
ptex-fonts.tar.xz
ptex.doc.tar.xz
ptex.tar.xz
ptex2pdf.doc.tar.xz
ptex2pdf.tar.xz
ptext.doc.tar.xz
ptext.tar.xz
ptptex.doc.tar.xz
ptptex.tar.xz
punk-latex.doc.tar.xz
punk-latex.tar.xz
punk.doc.tar.xz
punk.tar.xz
punknova.doc.tar.xz
punknova.tar.xz
purifyeps.doc.tar.xz
purifyeps.tar.xz
pxbase.doc.tar.xz
pxbase.tar.xz
pxchfon.doc.tar.xz
pxchfon.tar.xz
pxcjkcat.doc.tar.xz
pxcjkcat.tar.xz
pxfonts.doc.tar.xz
pxfonts.tar.xz
pxgreeks.doc.tar.xz
pxgreeks.tar.xz
pxjahyper.doc.tar.xz
pxjahyper.tar.xz
pxpgfmark.doc.tar.xz
pxpgfmark.tar.xz
pxrubrica.doc.tar.xz
pxrubrica.tar.xz
pxtxalfa.doc.tar.xz
pxtxalfa.tar.xz
pygmentex.doc.tar.xz
pygmentex.tar.xz
python.doc.tar.xz
python.tar.xz
pythontex.doc.tar.xz
pythontex.tar.xz
New:
----
placeins-plain.tar.xz
plain-doc.doc.tar.xz
plain.tar.xz
plainpkg.doc.tar.xz
plainpkg.tar.xz
plantslabels.doc.tar.xz
plantslabels.tar.xz
plari.doc.tar.xz
plari.tar.xz
plates.doc.tar.xz
plates.tar.xz
platex-tools.doc.tar.xz
platex-tools.tar.xz
platex.doc.tar.xz
platex.tar.xz
platexcheat.doc.tar.xz
play.doc.tar.xz
play.tar.xz
playfair.doc.tar.xz
playfair.tar.xz
plipsum.doc.tar.xz
plipsum.tar.xz
plnfss.doc.tar.xz
plnfss.tar.xz
plstmary.doc.tar.xz
plstmary.tar.xz
plweb.doc.tar.xz
plweb.tar.xz
pmgraph.doc.tar.xz
pmgraph.tar.xz
pmx.doc.tar.xz
pmx.tar.xz
pmxchords.doc.tar.xz
pmxchords.tar.xz
pnas2009.tar.xz
poemscol.doc.tar.xz
poemscol.tar.xz
poetrytex.doc.tar.xz
poetrytex.tar.xz
polski.doc.tar.xz
polski.tar.xz
poltawski.doc.tar.xz
poltawski.tar.xz
polyglossia.doc.tar.xz
polyglossia.tar.xz
polynom.doc.tar.xz
polynom.tar.xz
polynomial.doc.tar.xz
polynomial.tar.xz
polytable.doc.tar.xz
polytable.tar.xz
postcards.doc.tar.xz
postcards.tar.xz
poster-mac.doc.tar.xz
poster-mac.tar.xz
powerdot-FUBerlin.doc.tar.xz
powerdot-FUBerlin.tar.xz
powerdot.doc.tar.xz
powerdot.tar.xz
ppr-prv.doc.tar.xz
ppr-prv.tar.xz
pracjourn.doc.tar.xz
pracjourn.tar.xz
preprint.doc.tar.xz
preprint.tar.xz
prerex.doc.tar.xz
prerex.tar.xz
present.doc.tar.xz
present.tar.xz
presentations-en.doc.tar.xz
presentations.doc.tar.xz
pressrelease.doc.tar.xz
pressrelease.tar.xz
prettyref.doc.tar.xz
prettyref.tar.xz
preview.doc.tar.xz
preview.tar.xz
prftree.doc.tar.xz
prftree.tar.xz
printlen.doc.tar.xz
printlen.tar.xz
proba.doc.tar.xz
proba.tar.xz
probsoln.doc.tar.xz
probsoln.tar.xz
procIAGssymp.doc.tar.xz
procIAGssymp.tar.xz
prodint.doc.tar.xz
prodint.tar.xz
productbox.doc.tar.xz
productbox.tar.xz
program.doc.tar.xz
program.tar.xz
progress.doc.tar.xz
progress.tar.xz
progressbar.doc.tar.xz
progressbar.tar.xz
proofread.doc.tar.xz
proofread.tar.xz
prooftrees.doc.tar.xz
prooftrees.tar.xz
properties.doc.tar.xz
properties.tar.xz
proposal.doc.tar.xz
proposal.tar.xz
prosper.doc.tar.xz
prosper.tar.xz
protex.doc.tar.xz
protex.tar.xz
protocol.doc.tar.xz
protocol.tar.xz
przechlewski-book.doc.tar.xz
przechlewski-book.tar.xz
ps2pk.doc.tar.xz
psbao.doc.tar.xz
psbao.tar.xz
pseudocode.doc.tar.xz
pseudocode.tar.xz
pst-arrow.doc.tar.xz
pst-arrow.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ texlive-specs-s.spec ++++++
++++ 25395 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/texlive-specs-s/texlive-specs-s.spec
++++ and /work/SRC/openSUSE:Factory/.texlive-specs-s.new/texlive-specs-s.spec
++++++ pst-support.doc.tar.xz -> pseudocode.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-support/README new/doc/generic/pst-support/README
--- old/doc/generic/pst-support/README 2009-02-06 19:45:39.000000000 +0100
+++ new/doc/generic/pst-support/README 1970-01-01 01:00:00.000000000 +0100
@@ -1,26 +0,0 @@
-Standard_transparency.joboptions
- File for the Distiller to make the transparency
- work with \usepackage[distiller]{pstricks}
- Put the file into \Adobe\ADOBE PDF\Settings\ or
- any similiar directory.
-
-latex-ps-pdf.tco
- TeXnicCenter profile for running
- latex->dvips->ps2pdf on a LaTeX file
-
-latex-pstpdf-pdf.tco
- TeXnicCenter profile for running
- latex->dvips->pdflatex on a LaTeX file
- but with using the package pst-pdf
-
-pdflatex-autopstpdf.tco
- TeXnicCenter profile for running
- pdflatex on a LaTeX file but with using
- the package auto-pst-pdf and an enabled
- --enable-write18 option for MiKTeX
-
-
-----
-All files are LPPL
-
-thanks to Thorsten
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-support/Standard_transparency.joboptions new/doc/generic/pst-support/Standard_transparency.joboptions
--- old/doc/generic/pst-support/Standard_transparency.joboptions 2009-02-06 19:45:39.000000000 +0100
+++ new/doc/generic/pst-support/Standard_transparency.joboptions 1970-01-01 01:00:00.000000000 +0100
@@ -1,232 +0,0 @@
-<<
- /ASCII85EncodePages false
- /AllowTransparency true
- /AutoPositionEPSFiles true
- /AutoRotatePages /All
- /Binding /Left
- /CalGrayProfile (Gray Gamma 2.2)
- /CalRGBProfile (sRGB IEC61966-2.1)
- /CalCMYKProfile (U.S. Web Coated \050SWOP\051 v2)
- /sRGBProfile (sRGB IEC61966-2.1)
- /CannotEmbedFontPolicy /Warning
- /CompatibilityLevel 1.4
- /CompressObjects /Tags
- /CompressPages true
- /ConvertImagesToIndexed true
- /PassThroughJPEGImages true
- /CreateJobTicket false
- /DefaultRenderingIntent /Default
- /DetectBlends true
- /DetectCurves 0.1000
- /ColorConversionStrategy /sRGB
- /DoThumbnails false
- /EmbedAllFonts true
- /EmbedOpenType false
- /ParseICCProfilesInComments true
- /EmbedJobOptions false
- /DSCReportingLevel 0
- /EmitDSCWarnings false
- /EndPage -1
- /ImageMemory 1048576
- /LockDistillerParams false
- /MaxSubsetPct 100
- /Optimize true
- /OPM 1
- /ParseDSCComments true
- /ParseDSCCommentsForDocInfo true
- /PreserveCopyPage true
- /PreserveDICMYKValues true
- /PreserveEPSInfo false
- /PreserveFlatness true
- /PreserveHalftoneInfo false
- /PreserveOPIComments false
- /PreserveOverprintSettings true
- /StartPage 1
- /SubsetFonts true
- /TransferFunctionInfo /Apply
- /UCRandBGInfo /Remove
- /UsePrologue false
- /ColorSettingsFile ()
- /AlwaysEmbed [ true
- ]
- /NeverEmbed [ true
- /Arial-Black
- /Arial-BlackItalic
- /Arial-BoldItalicMT
- /Arial-BoldMT
- /Arial-ItalicMT
- /ArialMT
- /ArialNarrow
- /ArialNarrow-Bold
- /ArialNarrow-BoldItalic
- /ArialNarrow-Italic
- /ArialUnicodeMS
- /CenturyGothic
- /CenturyGothic-Bold
- /CenturyGothic-BoldItalic
- /CenturyGothic-Italic
- /CourierNewPS-BoldItalicMT
- /CourierNewPS-BoldMT
- /CourierNewPS-ItalicMT
- /CourierNewPSMT
- /Georgia
- /Georgia-Bold
- /Georgia-BoldItalic
- /Georgia-Italic
- /Impact
- /LucidaConsole
- /Tahoma
- /Tahoma-Bold
- /TimesNewRomanMT-ExtraBold
- /TimesNewRomanPS-BoldItalicMT
- /TimesNewRomanPS-BoldMT
- /TimesNewRomanPS-ItalicMT
- /TimesNewRomanPSMT
- /Trebuchet-BoldItalic
- /TrebuchetMS
- /TrebuchetMS-Bold
- /TrebuchetMS-Italic
- /Verdana
- /Verdana-Bold
- /Verdana-BoldItalic
- /Verdana-Italic
- ]
- /AntiAliasColorImages false
- /CropColorImages true
- /ColorImageMinResolution 150
- /ColorImageMinResolutionPolicy /OK
- /DownsampleColorImages true
- /ColorImageDownsampleType /Bicubic
- /ColorImageResolution 150
- /ColorImageDepth -1
- /ColorImageMinDownsampleDepth 1
- /ColorImageDownsampleThreshold 1.50000
- /EncodeColorImages true
- /ColorImageFilter /DCTEncode
- /AutoFilterColorImages true
- /ColorImageAutoFilterStrategy /JPEG
- /ColorACSImageDict <<
- /QFactor 0.76
- /HSamples [2 1 1 2] /VSamples [2 1 1 2]
- >>
- /ColorImageDict <<
- /QFactor 0.76
- /HSamples [2 1 1 2] /VSamples [2 1 1 2]
- >>
- /JPEG2000ColorACSImageDict <<
- /TileWidth 256
- /TileHeight 256
- /Quality 15
- >>
- /JPEG2000ColorImageDict <<
- /TileWidth 256
- /TileHeight 256
- /Quality 15
- >>
- /AntiAliasGrayImages false
- /CropGrayImages true
- /GrayImageMinResolution 150
- /GrayImageMinResolutionPolicy /OK
- /DownsampleGrayImages true
- /GrayImageDownsampleType /Bicubic
- /GrayImageResolution 150
- /GrayImageDepth -1
- /GrayImageMinDownsampleDepth 2
- /GrayImageDownsampleThreshold 1.50000
- /EncodeGrayImages true
- /GrayImageFilter /DCTEncode
- /AutoFilterGrayImages true
- /GrayImageAutoFilterStrategy /JPEG
- /GrayACSImageDict <<
- /QFactor 0.76
- /HSamples [2 1 1 2] /VSamples [2 1 1 2]
- >>
- /GrayImageDict <<
- /QFactor 0.76
- /HSamples [2 1 1 2] /VSamples [2 1 1 2]
- >>
- /JPEG2000GrayACSImageDict <<
- /TileWidth 256
- /TileHeight 256
- /Quality 15
- >>
- /JPEG2000GrayImageDict <<
- /TileWidth 256
- /TileHeight 256
- /Quality 15
- >>
- /AntiAliasMonoImages false
- /CropMonoImages true
- /MonoImageMinResolution 1200
- /MonoImageMinResolutionPolicy /OK
- /DownsampleMonoImages true
- /MonoImageDownsampleType /Bicubic
- /MonoImageResolution 1200
- /MonoImageDepth -1
- /MonoImageDownsampleThreshold 1.50000
- /EncodeMonoImages true
- /MonoImageFilter /CCITTFaxEncode
- /MonoImageDict <<
- /K -1
- >>
- /AllowPSXObjects true
- /CheckCompliance [
- /None
- ]
- /PDFX1aCheck false
- /PDFX3Check false
- /PDFXCompliantPDFOnly false
- /PDFXNoTrimBoxError true
- /PDFXTrimBoxToMediaBoxOffset [
- 0.00000
- 0.00000
- 0.00000
- 0.00000
- ]
- /PDFXSetBleedBoxToMediaBox true
- /PDFXBleedBoxToTrimBoxOffset [
- 0.00000
- 0.00000
- 0.00000
- 0.00000
- ]
- /PDFXOutputIntentProfile (None)
- /PDFXOutputConditionIdentifier ()
- /PDFXOutputCondition ()
- /PDFXRegistryName ()
- /PDFXTrapped /False
-
- /CreateJDFFile false
- /Description <<
- /ARA <FEFF06270633062A062E062F0645002006470630064700200627064406250639062F0627062F0627062A002006440625064606340627062100200648062B062706260642002000410064006F00620065002000500044004600200645062A064806270641064206290020064506390020064506420627064A064A0633002006390631063600200648063706280627063906290020062706440648062B0627062606420020062706440645062A062F062706480644062900200641064A00200645062C062706440627062A002006270644062306390645062706440020062706440645062E062A064406410629061B0020064A06450643064600200641062A062D00200648062B0627062606420020005000440046002006270644064506460634062306290020062806270633062A062E062F062706450020004100630072006F0062006100740020064800410064006F006200650020005200650061006400650072002006250635062F0627063100200035002E0030002006480627064406250635062F062706310627062A0020062706440623062D062F062B002E>
- /CHS <FEFF4f7f75288fd94e9b8bbe5b9a521b5efa7684002000410064006f006200650020005000440046002065876863900275284e8e55464e1a65876863768467e5770b548c62535370300260a853ef4ee54f7f75280020004100630072006f0062006100740020548c002000410064006f00620065002000520065006100640065007200200035002e003000204ee553ca66f49ad87248672c676562535f00521b5efa768400200050004400460020658768633002>
- /CHT <FEFF4f7f752890194e9b8a2d7f6e5efa7acb7684002000410064006f006200650020005000440046002065874ef69069752865bc666e901a554652d965874ef6768467e5770b548c52175370300260a853ef4ee54f7f75280020004100630072006f0062006100740020548c002000410064006f00620065002000520065006100640065007200200035002e003000204ee553ca66f49ad87248672c4f86958b555f5df25efa7acb76840020005000440046002065874ef63002>
- /CZE <FEFF005400610074006f0020006e006100730074006100760065006e00ed00200070006f0075017e0069006a007400650020006b0020007600790074007600e101590065006e00ed00200064006f006b0075006d0065006e0074016f002000410064006f006200650020005000440046002000760068006f0064006e00fd00630068002000700072006f002000730070006f006c00650068006c0069007600e90020007a006f006200720061007a006f007600e1006e00ed002000610020007400690073006b0020006f006200630068006f0064006e00ed0063006800200064006f006b0075006d0065006e0074016f002e002000200056007900740076006f01590065006e00e900200064006f006b0075006d0065006e007400790020005000440046002000620075006400650020006d006f017e006e00e90020006f007400650076015900ed007400200076002000700072006f006700720061006d0065006300680020004100630072006f00620061007400200061002000410064006f00620065002000520065006100640065007200200035002e0030002000610020006e006f0076011b006a016100ed00630068002e>
- /DAN <FEFF004200720075006700200069006e0064007300740069006c006c0069006e006700650072006e0065002000740069006c0020006100740020006f007000720065007400740065002000410064006f006200650020005000440046002d0064006f006b0075006d0065006e007400650072002c0020006400650072002000650067006e006500720020007300690067002000740069006c00200064006500740061006c006a006500720065007400200073006b00e60072006d007600690073006e0069006e00670020006f00670020007500640073006b007200690076006e0069006e006700200061006600200066006f0072007200650074006e0069006e006700730064006f006b0075006d0065006e007400650072002e0020004400650020006f007000720065007400740065006400650020005000440046002d0064006f006b0075006d0065006e0074006500720020006b0061006e002000e50062006e00650073002000690020004100630072006f00620061007400200065006c006c006500720020004100630072006f006200610074002000520065006100640065007200200035002e00300020006f00670020006e0079006500720065002e>
- /DEU <FEFF00560065007200770065006e00640065006e0020005300690065002000640069006500730065002000450069006e007300740065006c006c0075006e00670065006e0020007a0075006d002000450072007300740065006c006c0065006e00200076006f006e002000410064006f006200650020005000440046002d0044006f006b0075006d0065006e00740065006e002c00200075006d002000650069006e00650020007a0075007600650072006c00e40073007300690067006500200041006e007a006500690067006500200075006e00640020004100750073006700610062006500200076006f006e00200047006500730063006800e40066007400730064006f006b0075006d0065006e00740065006e0020007a0075002000650072007a00690065006c0065006e002e00200044006900650020005000440046002d0044006f006b0075006d0065006e007400650020006b00f6006e006e0065006e0020006d006900740020004100630072006f00620061007400200075006e0064002000520065006100640065007200200035002e003000200075006e00640020006800f600680065007200200067006500f600660066006e00650074002000770065007200640065006e002e>
- /ESP <FEFF005500740069006c0069006300650020006500730074006100200063006f006e0066006900670075007200610063006900f3006e0020007000610072006100200063007200650061007200200064006f00630075006d0065006e0074006f0073002000640065002000410064006f00620065002000500044004600200061006400650063007500610064006f007300200070006100720061002000760069007300750061006c0069007a00610063006900f3006e0020006500200069006d0070007200650073006900f3006e00200064006500200063006f006e006600690061006e007a006100200064006500200064006f00630075006d0065006e0074006f007300200063006f006d00650072006300690061006c00650073002e002000530065002000700075006500640065006e00200061006200720069007200200064006f00630075006d0065006e0074006f00730020005000440046002000630072006500610064006f007300200063006f006e0020004100630072006f006200610074002c002000410064006f00620065002000520065006100640065007200200035002e003000200079002000760065007200730069006f006e0065007300200070006f00730074006500720069006f007200650073002e>
- /FRA <FEFF005500740069006c006900730065007a00200063006500730020006f007000740069006f006e00730020006100660069006e00200064006500200063007200e900650072002000640065007300200064006f00630075006d0065006e00740073002000410064006f006200650020005000440046002000700072006f00660065007300730069006f006e006e0065006c007300200066006900610062006c0065007300200070006f007500720020006c0061002000760069007300750061006c00690073006100740069006f006e0020006500740020006c00270069006d007000720065007300730069006f006e002e0020004c0065007300200064006f00630075006d0065006e00740073002000500044004600200063007200e900e90073002000700065007500760065006e0074002000ea0074007200650020006f007500760065007200740073002000640061006e00730020004100630072006f006200610074002c002000610069006e00730069002000710075002700410064006f00620065002000520065006100640065007200200035002e0030002000650074002000760065007200730069006f006e007300200075006c007400e90072006900650075007200650073002e>
- /GRE <FEFF03a703c103b703c303b903bc03bf03c003bf03b903ae03c303c403b5002003b103c503c403ad03c2002003c403b903c2002003c103c503b803bc03af03c303b503b903c2002003b303b903b1002003bd03b1002003b403b703bc03b903bf03c503c103b303ae03c303b503c403b5002003ad03b303b303c103b103c603b1002000410064006f006200650020005000440046002003ba03b103c403ac03bb03bb03b703bb03b1002003b303b903b1002003b103be03b903cc03c003b903c303c403b7002003c003c103bf03b203bf03bb03ae002003ba03b103b9002003b503ba03c403cd03c003c903c303b7002003b503c003b903c703b503b903c103b703bc03b103c403b903ba03ce03bd002003b503b303b303c103ac03c603c903bd002e0020002003a403b10020005000440046002003ad03b303b303c103b103c603b1002003c003bf03c5002003ad03c703b503c403b5002003b403b703bc03b903bf03c503c103b303ae03c303b503b9002003bc03c003bf03c103bf03cd03bd002003bd03b1002003b103bd03bf03b903c703c403bf03cd03bd002003bc03b5002003c403bf0020004100630072006f006200610074002c002003c403bf002000410064006f00620065002000520065006100640065007200200035002e0030002003ba03b103b9002003bc03b503c403b103b303b503bd03ad03c303c403b503c103b503c2002003b503ba03b403cc03c303b503b903c2002e>
- /HEB <FEFF05D405E905EA05DE05E905D5002005D105D405D205D305E805D505EA002005D005DC05D4002005DB05D305D9002005DC05D905E605D505E8002005DE05E105DE05DB05D9002000410064006F006200650020005000440046002005E205D105D505E8002005D405E605D205D4002005D505D405D305E405E105D4002005D005DE05D905E005D4002005E905DC002005DE05E105DE05DB05D905DD002005E205E105E705D905D905DD002E002005DE05E105DE05DB05D90020005000440046002005E905E005D505E605E805D5002005E005D905EA05E005D905DD002005DC05E405EA05D905D705D4002005D105D005DE05E605E205D505EA0020004100630072006F006200610074002005D5002D00410064006F00620065002000520065006100640065007200200035002E0030002005D505D205E805E105D005D505EA002005DE05EA05E705D305DE05D505EA002005D905D505EA05E8002E05D905D505EA05E8002E002D0033002C002005E205D905D905E005D5002005D105DE05D305E805D905DA002005DC05DE05E905EA05DE05E9002005E905DC0020004100630072006F006200610074002E002005DE05E105DE05DB05D90020005000440046002005E905E005D505E605E805D5002005E005D905EA05E005D905DD002005DC05E405EA05D905D705D4002005D105D005DE05E605E205D505EA0020004100630072006F006200610074002005D5002D00410064006F00620065002000520065006100640065007200200035002E0030002005D505D205E805E105D005D505EA002005DE05EA05E705D305DE05D505EA002005D905D505EA05E8002E>
- /HRV (Za stvaranje Adobe PDF dokumenata pogodnih za pouzdani prikaz i ispis poslovnih dokumenata koristite ove postavke. Stvoreni PDF dokumenti mogu se otvoriti Acrobat i Adobe Reader 5.0 i kasnijim verzijama.)
- /HUN <FEFF00410020006800690076006100740061006c006f007300200064006f006b0075006d0065006e00740075006d006f006b0020006d00650067006200ed007a00680061007400f30020006d0065006700740065006b0069006e007400e9007300e900720065002000e900730020006e0079006f006d00740061007400e1007300e10072006100200073007a00e1006e0074002000410064006f00620065002000500044004600200064006f006b0075006d0065006e00740075006d006f006b0061007400200065007a0065006b006b0065006c0020006100200062006500e1006c006c00ed007400e10073006f006b006b0061006c00200068006f007a006800610074006a00610020006c00e9007400720065002e0020002000410020006c00e90074007200650068006f007a006f00740074002000500044004600200064006f006b0075006d0065006e00740075006d006f006b00200061007a0020004100630072006f006200610074002000e9007300200061007a002000410064006f00620065002000520065006100640065007200200035002e0030002c0020007600610067007900200061007a002000610074007400f3006c0020006b00e9007301510062006200690020007600650072007a006900f3006b006b0061006c0020006e00790069007400680061007400f3006b0020006d00650067002e>
- /ITA (Utilizzare queste impostazioni per creare documenti Adobe PDF adatti per visualizzare e stampare documenti aziendali in modo affidabile. I documenti PDF creati possono essere aperti con Acrobat e Adobe Reader 5.0 e versioni successive.)
- /JPN <FEFF30d330b830cd30b9658766f8306e8868793a304a3088307353705237306b90693057305f002000410064006f0062006500200050004400460020658766f8306e4f5c6210306b4f7f75283057307e305930023053306e8a2d5b9a30674f5c62103055308c305f0020005000440046002030d530a130a430eb306f3001004100630072006f0062006100740020304a30883073002000410064006f00620065002000520065006100640065007200200035002e003000204ee5964d3067958b304f30533068304c3067304d307e305930023053306e8a2d5b9a3067306f30d530a930f330c8306e57cb30818fbc307f3092884c3044307e30593002>
- /KOR <FEFFc7740020c124c815c7440020c0acc6a9d558c5ec0020be44c988b2c8c2a40020bb38c11cb97c0020c548c815c801c73cb85c0020bcf4ace00020c778c1c4d558b2940020b3700020ac00c7a50020c801d569d55c002000410064006f0062006500200050004400460020bb38c11cb97c0020c791c131d569b2c8b2e4002e0020c774b807ac8c0020c791c131b41c00200050004400460020bb38c11cb2940020004100630072006f0062006100740020bc0f002000410064006f00620065002000520065006100640065007200200035002e00300020c774c0c1c5d0c11c0020c5f40020c2180020c788c2b5b2c8b2e4002e>
- /NLD (Gebruik deze instellingen om Adobe PDF-documenten te maken waarmee zakelijke documenten betrouwbaar kunnen worden weergegeven en afgedrukt. De gemaakte PDF-documenten kunnen worden geopend met Acrobat en Adobe Reader 5.0 en hoger.)
- /NOR <FEFF004200720075006b00200064006900730073006500200069006e006e007300740069006c006c0069006e00670065006e0065002000740069006c002000e50020006f0070007000720065007400740065002000410064006f006200650020005000440046002d0064006f006b0075006d0065006e00740065007200200073006f006d002000650072002000650067006e0065007400200066006f00720020007000e5006c006900740065006c006900670020007600690073006e0069006e00670020006f00670020007500740073006b007200690066007400200061007600200066006f0072007200650074006e0069006e006700730064006f006b0075006d0065006e007400650072002e0020005000440046002d0064006f006b0075006d0065006e00740065006e00650020006b0061006e002000e50070006e00650073002000690020004100630072006f00620061007400200065006c006c00650072002000410064006f00620065002000520065006100640065007200200035002e003000200065006c006c00650072002e>
- /POL <FEFF0055007300740061007700690065006e0069006100200064006f002000740077006f0072007a0065006e0069006100200064006f006b0075006d0065006e007400f300770020005000440046002000700072007a0065007a006e00610063007a006f006e00790063006800200064006f0020006e00690065007a00610077006f0064006e00650067006f002000770079015b0077006900650074006c0061006e00690061002000690020006400720075006b006f00770061006e0069006100200064006f006b0075006d0065006e007400f300770020006600690072006d006f0077007900630068002e002000200044006f006b0075006d0065006e0074007900200050004400460020006d006f017c006e00610020006f007400770069006500720061010700200077002000700072006f006700720061006d006900650020004100630072006f00620061007400200069002000410064006f00620065002000520065006100640065007200200035002e0030002000690020006e006f00770073007a0079006d002e>
- /PTB <FEFF005500740069006c0069007a006500200065007300730061007300200063006f006e00660069006700750072006100e700f50065007300200064006500200066006f0072006d00610020006100200063007200690061007200200064006f00630075006d0065006e0074006f0073002000410064006f00620065002000500044004600200061006400650071007500610064006f00730020007000610072006100200061002000760069007300750061006c0069007a006100e700e3006f002000650020006100200069006d0070007200650073007300e3006f00200063006f006e0066006900e1007600650069007300200064006500200064006f00630075006d0065006e0074006f007300200063006f006d0065007200630069006100690073002e0020004f007300200064006f00630075006d0065006e0074006f00730020005000440046002000630072006900610064006f007300200070006f00640065006d0020007300650072002000610062006500720074006f007300200063006f006d0020006f0020004100630072006f006200610074002000650020006f002000410064006f00620065002000520065006100640065007200200035002e0030002000650020007600650072007300f50065007300200070006f00730074006500720069006f007200650073002e>
- /RUM <FEFF005500740069006c0069007a00610163006900200061006300650073007400650020007300650074010300720069002000700065006e007400720075002000610020006300720065006100200064006f00630075006d0065006e00740065002000410064006f006200650020005000440046002000610064006500630076006100740065002000700065006e007400720075002000760069007a00750061006c0069007a00610072006500610020015f006900200074006900700103007200690072006500610020006c0061002000630061006c006900740061007400650020007300750070006500720069006f0061007201030020006100200064006f00630075006d0065006e00740065006c006f007200200064006500200061006600610063006500720069002e002000200044006f00630075006d0065006e00740065006c00650020005000440046002000630072006500610074006500200070006f00740020006600690020006400650073006300680069007300650020006300750020004100630072006f006200610074002c002000410064006f00620065002000520065006100640065007200200035002e00300020015f00690020007600650072007300690075006e0069006c006500200075006c0074006500720069006f006100720065002e>
- /RUS <FEFF04180441043f043e043b044c04370443043904420435002004340430043d043d044b04350020043d0430044104420440043e0439043a043800200434043b044f00200441043e043704340430043d0438044f00200434043e043a0443043c0435043d0442043e0432002000410064006f006200650020005000440046002c0020043f043e04340445043e0434044f04490438044500200434043b044f0020043d0430043404350436043d043e0433043e0020043f0440043e0441043c043e044204400430002004380020043f04350447043004420438002004340435043b043e0432044b044500200434043e043a0443043c0435043d0442043e0432002e002000200421043e043704340430043d043d044b04350020005000440046002d0434043e043a0443043c0435043d0442044b0020043c043e0436043d043e0020043e0442043a0440044b043204300442044c002004410020043f043e043c043e0449044c044e0020004100630072006f00620061007400200438002000410064006f00620065002000520065006100640065007200200035002e00300020043800200431043e043b043504350020043f043e04370434043d043804450020043204350440044104380439002e>
- /SLV <FEFF005400650020006e006100730074006100760069007400760065002000750070006f0072006100620069007400650020007a00610020007500730074007600610072006a0061006e006a006500200064006f006b0075006d0065006e0074006f0076002000410064006f006200650020005000440046002c0020007000720069006d00650072006e006900680020007a00610020007a0061006e00650073006c006a00690076006f0020006f0067006c00650064006f00760061006e006a006500200069006e0020007400690073006b0061006e006a006500200070006f0073006c006f0076006e0069006800200064006f006b0075006d0065006e0074006f0076002e00200020005500730074007600610072006a0065006e006500200064006f006b0075006d0065006e0074006500200050004400460020006a00650020006d006f0067006f010d00650020006f0064007000720065007400690020007a0020004100630072006f00620061007400200069006e002000410064006f00620065002000520065006100640065007200200035002e003000200069006e0020006e006f00760065006a01610069006d002e>
- /SUO <FEFF004b00e40079007400e40020006e00e40069007400e4002000610073006500740075006b007300690061002c0020006b0075006e0020006c0075006f0074002000410064006f0062006500200050004400460020002d0064006f006b0075006d0065006e007400740065006a0061002c0020006a006f0074006b006100200073006f0070006900760061007400200079007200690074007900730061007300690061006b00690072006a006f006a0065006e0020006c0075006f00740065007400740061007600610061006e0020006e00e400790074007400e4006d0069007300650065006e0020006a0061002000740075006c006f007300740061006d0069007300650065006e002e0020004c0075006f0064007500740020005000440046002d0064006f006b0075006d0065006e00740069007400200076006f0069006400610061006e0020006100760061007400610020004100630072006f0062006100740069006c006c00610020006a0061002000410064006f00620065002000520065006100640065007200200035002e0030003a006c006c00610020006a006100200075007500640065006d006d0069006c006c0061002e>
- /SVE <FEFF0041006e007600e4006e00640020006400650020006800e4007200200069006e0073007400e4006c006c006e0069006e006700610072006e00610020006f006d002000640075002000760069006c006c00200073006b006100700061002000410064006f006200650020005000440046002d0064006f006b0075006d0065006e007400200073006f006d00200070006100730073006100720020006600f60072002000740069006c006c006600f60072006c00690074006c006900670020007600690073006e0069006e00670020006f006300680020007500740073006b007200690066007400650072002000610076002000610066006600e4007200730064006f006b0075006d0065006e0074002e002000200053006b006100700061006400650020005000440046002d0064006f006b0075006d0065006e00740020006b0061006e002000f600700070006e00610073002000690020004100630072006f0062006100740020006f00630068002000410064006f00620065002000520065006100640065007200200035002e00300020006f00630068002000730065006e006100720065002e>
- /TUR <FEFF005400690063006100720069002000620065006c00670065006c006500720069006e0020006700fc00760065006e0069006c0069007200200062006900720020015f0065006b0069006c006400650020006700f6007200fc006e007400fc006c0065006e006d006500730069002000760065002000790061007a0064013100720131006c006d006100730131006e006100200075007900670075006e002000410064006f006200650020005000440046002000620065006c00670065006c0065007200690020006f006c0075015f007400750072006d0061006b0020006900e70069006e00200062007500200061007900610072006c0061007201310020006b0075006c006c0061006e0131006e002e00200020004f006c0075015f0074007500720075006c0061006e0020005000440046002000620065006c00670065006c0065007200690020004100630072006f006200610074002000760065002000410064006f00620065002000520065006100640065007200200035002e003000200076006500200073006f006e0072006100730131006e00640061006b00690020007300fc007200fc006d006c00650072006c00650020006100e70131006c006100620069006c00690072002e>
- /ENU (Use these settings to create Adobe PDF documents suitable for reliable viewing and printing of business documents. Created PDF documents can be opened with Acrobat and Adobe Reader 5.0 and later.)
- >>
->> setdistillerparams
-<<
- /HWResolution [600 600]
- /PageSize [612.000 792.000]
->> setpagedevice
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-support/latex-ps-pdf.tco new/doc/generic/pst-support/latex-ps-pdf.tco
--- old/doc/generic/pst-support/latex-ps-pdf.tco 2009-02-06 19:45:39.000000000 +0100
+++ new/doc/generic/pst-support/latex-ps-pdf.tco 1970-01-01 01:00:00.000000000 +0100
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
-http://schemas.ToolsCenter.org/TeXnicCenter/OutputProfiles.xsd">
- <outputProfileList>
- <outputProfile name="LaTeX => PS => PDF" stopOnLatexError="false">
- <texCommand execute="true" path="latex.exe" arguments="--src -interaction=nonstopmode "%Wm""/>
- <bibTexCommand execute="true" path="bibtex.exe" arguments=""%bm""/>
- <makeIndexCommand execute="true" path="makeindex.exe" arguments=""%bm""/>
- <postProcessors>
- <processor name="DviPs (PDF)" path="dvips.exe" arguments="-t a4 -P pdf "%Bm.dvi"" inputFile="" outputFile=""/>
- <processor name="Ghostscript (ps2pdf)" path="gswin32c.exe" arguments="-sPAPERSIZE=a4 -dSAFER -dBATCH -dNOPAUSE -sDEVICE=pdfwrite -sOutputFile="%bm.pdf" -c save pop -f "%bm.ps"" inputFile="" outputFile=""/>
- </postProcessors>
- <viewer path="ACROBAT.EXE" closeBeforeCompilation="false">
- <viewProjectCommand type="commandLine">
- <commandLineCommand path="ACROBAT.EXE" arguments=" "%bm.pdf""/>
- <ddeCommand path="" server="" topic="System" command=""/>
- </viewProjectCommand>
- <viewCurrentFileCommand type="commandLine">
- <commandLineCommand path="ACROBAT.EXE" arguments=" "%bm.pdf""/>
- <ddeCommand path="" server="" topic="System" command=""/>
- </viewCurrentFileCommand>
- <viewCloseCommand type="commandLine">
- <commandLineCommand path="" arguments=""/>
- <ddeCommand path="" server="" topic="System" command=""/>
- </viewCloseCommand>
- </viewer>
- </outputProfile>
- </outputProfileList>
-
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-support/latex-pstpdf-pdf.tco new/doc/generic/pst-support/latex-pstpdf-pdf.tco
--- old/doc/generic/pst-support/latex-pstpdf-pdf.tco 2009-02-06 19:45:39.000000000 +0100
+++ new/doc/generic/pst-support/latex-pstpdf-pdf.tco 1970-01-01 01:00:00.000000000 +0100
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
-http://schemas.ToolsCenter.org/TeXnicCenter/OutputProfiles.xsd">
- <outputProfileList>
- <outputProfile name="LaTeX => pst-pdf => PDF" stopOnLatexError="false">
- <texCommand execute="true" path="latex.exe" arguments="--src -interaction=nonstopmode -max-print-line=120 "%Wm""/>
- <bibTexCommand execute="false" path="bibtex.exe" arguments=""%bm""/>
- <makeIndexCommand execute="false" path="makeindex.exe" arguments="-s personal.ist -g "%bm""/>
- <postProcessors>
- <processor name="DviPs (PDF)" path="dvips.exe" arguments="-o "%Bm-pics.ps" "%Bm.dvi"" inputFile="" outputFile=""/>
- <processor name="Ghostscript (ps2pdf)" path="gswin32.exe" arguments="-sPAPERSIZE=a4 -dNOSAFER -dBATCH -dNOPAUSE -sDEVICE=pdfwrite -sOutputFile="%bm-pics.pdf" -c save pop -f "%bm-pics.ps"" inputFile="" outputFile=""/>
- <processor name="PDFLatex" path="pdflatex.exe" arguments="-interaction=nonstopmode -max-print-line=120 "%Bm"" inputFile="" outputFile=""/>
- </postProcessors>
- <viewer path="Acrobat.exe" closeBeforeCompilation="false">
- <viewProjectCommand type="dde">
- <commandLineCommand path="gsview32.exe" arguments=""%bm.pdf""/>
- <ddeCommand path="Acrobat.exe" server="acroview" topic="control" command="[DocOpen("%bm.pdf")][FileOpen("%bm.pdf")]"/>
- </viewProjectCommand>
- <viewCurrentFileCommand type="dde">
- <commandLineCommand path="gsview32.exe" arguments=""%bm.pdf""/>
- <ddeCommand path="Acrobat.exe" server="acroview" topic="control" command="[DocOpen("%bm.pdf")][FileOpen("%bm.pdf")]"/>
- </viewCurrentFileCommand>
- <viewCloseCommand type="dde">
- <commandLineCommand path="" arguments=""/>
- <ddeCommand path="" server="acroview" topic="control" command="[DocClose("%bm.pdf")]"/>
- </viewCloseCommand>
- </viewer>
- </outputProfile>
- </outputProfileList>
-
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-support/pdflatex-autopstpdf.tco new/doc/generic/pst-support/pdflatex-autopstpdf.tco
--- old/doc/generic/pst-support/pdflatex-autopstpdf.tco 2009-02-06 19:45:39.000000000 +0100
+++ new/doc/generic/pst-support/pdflatex-autopstpdf.tco 1970-01-01 01:00:00.000000000 +0100
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
-http://schemas.ToolsCenter.org/TeXnicCenter/OutputProfiles.xsd">
- <outputProfileList>
- <outputProfile name="LaTeX => auto-pst-pdf => PDF" stopOnLatexError="false">
- <texCommand execute="true" path="pdflatex.exe" arguments="--src -interaction=nonstopmode -max-print-line=120 --enable-write18 "%Wm""/>
- <bibTexCommand execute="false" path="bibtex.exe" arguments=""%bm""/>
- <makeIndexCommand execute="false" path="makeindex.exe" arguments="-s personal.ist -g "%bm""/>
- <postProcessors/>
- <viewer path="Acrobat.exe" closeBeforeCompilation="false">
- <viewProjectCommand type="dde">
- <commandLineCommand path="gsview32.exe" arguments=""%bm.pdf""/>
- <ddeCommand path="Acrobat.exe" server="acroview" topic="control" command="[DocOpen("%bm.pdf")][FileOpen("%bm.pdf")]"/>
- </viewProjectCommand>
- <viewCurrentFileCommand type="dde">
- <commandLineCommand path="gsview32.exe" arguments=""%bm.pdf""/>
- <ddeCommand path="Acrobat.exe" server="acroview" topic="control" command="[DocOpen("%bm.pdf")][FileOpen("%bm.pdf")]"/>
- </viewCurrentFileCommand>
- <viewCloseCommand type="dde">
- <commandLineCommand path="" arguments=""/>
- <ddeCommand path="" server="acroview" topic="control" command="[DocClose("%bm.pdf")]"/>
- </viewCloseCommand>
- </viewer>
- </outputProfile>
- </outputProfileList>
-
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pseudocode/pseudocode.sty new/tex/latex/pseudocode/pseudocode.sty
--- old/tex/latex/pseudocode/pseudocode.sty 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/latex/pseudocode/pseudocode.sty 2016-11-25 19:33:57.000000000 +0100
@@ -0,0 +1,201 @@
+%%
+%% January 14, 2004
+%%
+%% pseudocode.sty
+%%
+%% S O F T W A R E L I C E N S E
+%% =================================
+%%
+%% The file pseudocode.sty
+%% is referred to as `the pseudocode package'
+%% or simply `the package'.
+%%
+%% The pseudocode package is copyright 1999 D.L. Kreher and D.R. Stinson.
+%%
+%% The pseudocode package and its drivers may be distributed and/or modified
+%% under the conditions of the LaTeX Project Public License, either version
+%% 1.3 of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2003/12/01 or later.
+%%
+%% The package has the LPPL maintenance status "maintained".
+%%
+%% The Current Maintainer is Donald L. Kreher.
+%%
+%% end of software license
+%%
+%% E-MAIL: kreher@mtu.edu dstinson@uwaterloo.ca
+%%
+%% DESCRIPTION:
+%% pseudocode.sty is a LaTeX style option, consisting of:
+%% the environment pseudocode
+%%
+%% INSTALLATION:
+%% Put this file where your TeX looks for inputs.
+%%
+%% DOCUMENTATION:
+%% See pseudocode.tex.
+%%
+%% \RETURN altered Oct 22, 1999
+%% Allowed for two column formating Dec 2, 2002
+%% \BREAK for breaking out of loops added Oct 10, 2003
+%% \FORALL added Oct 10, 2003
+%%
+%% CODE:
+\typeout{** }
+\typeout{** Document Style `pseudocode' - environment }
+\typeout{** by D.L. Kreher and D.R. Stinson }
+\typeout{** }
+\typeout{** The pseudocode environment was originally developed for the book}
+\typeout{** Combinatorial Algorithms: Enumeration, Generation, and Search}
+\typeout{** CRC Press, 1999. }
+
+%
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{pseudocode}
+%
+\if@twocolumn
+\newlength{\pcode@width}
+\setlength{\pcode@width}{\columnwidth}
+\addtolength{\pcode@width}{-40pt}
+\else
+\newlength{\pcode@width}
+\setlength{\pcode@width}{\textwidth}
+\addtolength{\pcode@width}{-40pt}
+\fi
+%
+\RequirePackage{fancybox}
+\RequirePackage{ifthen}
+%
+\newcommand{\pcode@AF}[1]{\mbox{\textsc{#1}}} % Algorithm font
+\newcounter{pseudocode}[section]
+\newcounter{pseudonum}
+\renewcommand{\thepseudonum}{\arabic{pseudonum}}
+\newcommand{\pcode@tab}[1]{\hspace*{#1ex}}
+\renewcommand{\thepseudocode}{\thesection.\arabic{pseudocode}}
+%
+\newboolean{pcode@plain}
+\newboolean{pcode@ruled}
+\newboolean{pcode@disp}
+\newboolean{pcode@shad}
+\newboolean{pcode@dbox}
+\newboolean{pcode@obox}
+\newboolean{pcode@Obox}
+\newboolean{pcode@fbox}
+%
+\newenvironment{pseudocode}[3][plain]
+{%
+ \refstepcounter{pseudocode}%
+ \ifthenelse{\equal{#1}{plain}}{\setboolean{pcode@plain}{true}}{\setboolean{pcode@plain}{false}}%
+ \ifthenelse{\equal{#1}{ruled}}{\setboolean{pcode@ruled}{true}}{\setboolean{pcode@ruled}{false}}%
+ \ifthenelse{\equal{#1}{display}}{\setboolean{pcode@disp}{true}}{\setboolean{pcode@disp}{false}}%
+ \ifthenelse{\equal{#1}{shadowbox}}{\setboolean{pcode@shad}{true}}{\setboolean{pcode@shad}{false}}%
+ \ifthenelse{\equal{#1}{doublebox}}{\setboolean{pcode@dbox}{true}}{\setboolean{pcode@dbox}{false}}%
+ \ifthenelse{\equal{#1}{ovalbox}}{\setboolean{pcode@obox}{true}}{\setboolean{pcode@obox}{false}}%
+ \ifthenelse{\equal{#1}{Ovalbox}}{\setboolean{pcode@Obox}{true}}{\setboolean{pcode@Obox}{false}}%
+ \ifthenelse{\equal{#1}{framebox}}{\setboolean{pcode@fbox}{true}}{\setboolean{pcode@fbox}{false}}%
+ \setcounter{pseudonum}{0}%
+ \ifthenelse{\boolean{pcode@disp}}%
+ {%
+ \noindent\begin{math}%
+ }%
+ {%
+ \begin{Sbox}%
+ \begin{minipage}{\pcode@width}%
+ \ifthenelse{\boolean{pcode@ruled}}
+ {
+ \noindent\rule{\pcode@width}{1pt}\hfill\\
+ {\bfseries Algorithm \thepseudocode:\pcode@tab{1}}\pcode@AF{#2}($#3$)\\
+ \noindent\rule{\pcode@width}{1pt}\hfill\\[1ex]
+ }
+ {
+ {\bfseries Algorithm \thepseudocode:\pcode@tab{1}}\pcode@AF{#2}($#3$)\\[2ex]
+ }
+ \noindent\begin{math}\begin{array}{@{\pcode@tab{1}}lr@{}}%
+ }{}%
+}%
+{%
+ \ifthenelse{\boolean{pcode@disp}}%
+ {%
+ \end{math}
+ }%
+ {%
+ \ifthenelse{\boolean{pcode@ruled}}
+ {
+ \end{array}\end{math}\\[1ex]
+ \noindent\rule{\pcode@width}{1pt}\hfill
+ \end{minipage}\end{Sbox}\bigskip\noindent%
+ }
+ {\end{array}\end{math}\end{minipage}\end{Sbox}\bigskip\noindent}%
+ \ifthenelse{\boolean{pcode@plain}}{\TheSbox}{}%
+ \ifthenelse{\boolean{pcode@ruled}}{\TheSbox}{}%
+ \ifthenelse{\boolean{pcode@shad}}{\shadowbox{\TheSbox}}{}%
+ \ifthenelse{\boolean{pcode@dbox}}{\doublebox{\TheSbox}}{}%
+ \ifthenelse{\boolean{pcode@obox}}{\cornersize*{4ex}\ovalbox{\TheSbox}}{}%
+ \ifthenelse{\boolean{pcode@Obox}}{\cornersize*{4ex}\Ovalbox{\TheSbox}}{}%
+ \ifthenelse{\boolean{pcode@fbox}}{\fbox{\TheSbox}}{}%
+ \bigskip%
+ }%
+}%
+%
+\newcommand{\STMTNUM}[2]{&\refstepcounter{pseudonum}\hspace*{#1}%
+\mbox{(\thepseudonum)\label{#2}}}
+\newcommand{\LOCAL}[1]{\mbox{\bfseries local}\pcode@tab{1}#1}
+\newcommand{\GLOBAL}[1]{\mbox{\bfseries global}\pcode@tab{1}#1}
+\newcommand{\EXTERNAL}[1]{\mbox{\bfseries external}\pcode@tab{1}#1}
+\newcommand{\COMMENT}[1]%
+{%
+ \vspace*{1ex}%
+ \mbox{\bfseries comment:}\pcode@tab{.5} \mbox{#1}
+}
+\newcommand{\BEGIN}{\left\{\begin{array}{@{}lr@{}}}
+\newcommand{\END}{\end{array}\right.}
+\newcommand{\PROCEDURE}[2]%
+{%
+ \mbox{\bfseries procedure }\pcode@AF{#1}(\ensuremath{#2})\\%
+ \begin{array}{@{\pcode@tab{1}}l@{}}%
+}
+\newcommand{\ENDPROCEDURE}{\vspace*{2ex}\end{array}\\ }
+\newcommand{\CALL}[2]{\pcode@AF{#1}(#2)} %
+\newcommand{\MAIN}{\mbox{\bfseries main}\\\begin{array}{@{\pcode@tab{1}}lr@{}}}
+\newcommand{\ENDMAIN}{\end{array}}
+\newcommand{\RETURN}[1]{\ifthenelse{\equal{#1}{} }%
+{\mbox{\bfseries return }}%
+{\mbox{\bfseries return }(#1)}}
+\newcommand{\OUTPUT}[1]{\mbox{\bfseries output }(#1)}
+\newcommand{\EXIT}{\mbox{\bfseries exit }}
+\newcommand{\BREAK}{\mbox{\bfseries break }}
+\newcommand{\IF}{\mbox{\bfseries if }}
+\newcommand{\LET}{\mbox{\bfseries let }}
+\newcommand{\CTHEN}{\pcode@tab{1}\mbox{ \bfseries then }}
+\newcommand{\CELSE}{\pcode@tab{1}\mbox{ \bfseries else }}
+\newcommand{\THEN}{\\\pcode@tab{1}\mbox{ \bfseries then }}
+\newcommand{\ELSE}{\\\pcode@tab{1}\mbox{ \bfseries else }}
+\newcommand{\ELSEIF}{\\\pcode@tab{1}\mbox{ \bfseries else if }}
+\newcommand{\FOREACH}{\mbox{\bfseries for each }}
+\newcommand{\FORALL}{\mbox{\bfseries for all }}
+\newcommand{\FOR}{\mbox{\bfseries for }}
+\newcommand{\TO}{\mbox{ \bfseries to }}
+\newcommand{\DOWNTO}{\mbox{ \bfseries downto }}
+\newcommand{\CASE}{\mbox{\bfseries case }}
+\newcommand{\OF}{\\\pcode@tab{1}\mbox{ \bfseries of }\BEGIN}
+\newcommand{\ENDCASE}{\END}
+\newcommand{\AND}{\mbox{ \bfseries and }}
+\newcommand{\OR}{\mbox{ \bfseries or }}
+\newcommand{\NOT}{\mbox{ \bfseries not }}
+\newcommand{\SUCCESS}{\mbox{ \bfseries success }}
+\newcommand{\FAIL}{\mbox{ \bfseries fail }}
+\newcommand{\TRUE}{\mbox{ \bfseries true }}
+\newcommand{\FALSE}{\mbox{ \bfseries false }}
+\newcommand{\GOTO}{\mbox{\bfseries go to }}
+\newcommand{\DO}{\\\pcode@tab{1}\mbox{ \bfseries do }}
+\newcommand{\ADO}{\mbox{ \bfseries do }}
+\newcommand{\WHILE}{\mbox{\bfseries while }}
+\newcommand{\REPEAT}{\mbox{\bfseries repeat }\\\begin{array}{@{\pcode@tab{1}}lr@{}}}
+\newcommand{\UNTIL}{\end{array}\\\mbox{\bfseries until }}
+\newcommand{\GETS}{\leftarrow}
+\endinput
+%% END pseudodcode.sty
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pseudocode.tlpobj new/tlpkg/tlpobj/pseudocode.tlpobj
--- old/tlpkg/tlpobj/pseudocode.tlpobj 1970-01-01 01:00:00.000000000 +0100
+++ new/tlpkg/tlpobj/pseudocode.tlpobj 2017-04-14 17:54:58.000000000 +0200
@@ -0,0 +1,13 @@
+name pseudocode
+category Package
+revision 15878
+shortdesc LaTeX environment for specifying algorithms in a natural way
+relocated 1
+longdesc This package provides the environment "pseudocode" for
+longdesc describing algorithms in a natural manner.
+runfiles size=2
+ RELOC/tex/latex/pseudocode/pseudocode.sty
+catalogue-ctan /macros/latex/contrib/pseudocode
+catalogue-date 2016-06-24 19:18:15 +0200
+catalogue-license lppl
+catalogue-topics pseudocode
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-support.doc.tlpobj new/tlpkg/tlpobj/pst-support.doc.tlpobj
--- old/tlpkg/tlpobj/pst-support.doc.tlpobj 2016-04-14 19:38:06.000000000 +0200
+++ new/tlpkg/tlpobj/pst-support.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
-name pst-support.doc
-category Package
-revision 15878
-shortdesc doc files of pst-support
-relocated 1
-docfiles size=10
- RELOC/doc/generic/pst-support/README
- RELOC/doc/generic/pst-support/Standard_transparency.joboptions
- RELOC/doc/generic/pst-support/latex-ps-pdf.tco
- RELOC/doc/generic/pst-support/latex-pstpdf-pdf.tco
- RELOC/doc/generic/pst-support/pdflatex-autopstpdf.tco
++++++ psfrag-italian.doc.tar.xz ++++++
++++++ psfrag.doc.tar.xz ++++++
++++++ psfrag.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/psfrag.tlpobj new/tlpkg/tlpobj/psfrag.tlpobj
--- old/tlpkg/tlpobj/psfrag.tlpobj 2016-04-14 19:36:29.000000000 +0200
+++ new/tlpkg/tlpobj/psfrag.tlpobj 2017-04-14 17:54:58.000000000 +0200
@@ -15,7 +15,7 @@
RELOC/tex/latex/psfrag/psfrag.sty
catalogue-also psfragx
catalogue-ctan /macros/latex/contrib/psfrag
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license other-free
catalogue-topics graphics-text
catalogue-version 3.04
++++++ psfragx.doc.tar.xz ++++++
++++++ psfragx.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/psfragx.tlpobj new/tlpkg/tlpobj/psfragx.tlpobj
--- old/tlpkg/tlpobj/psfragx.tlpobj 2016-04-14 19:36:30.000000000 +0200
+++ new/tlpkg/tlpobj/psfragx.tlpobj 2017-04-14 17:54:59.000000000 +0200
@@ -22,7 +22,7 @@
RELOC/tex/latex/psfragx/psfragx.cfg
RELOC/tex/latex/psfragx/psfragx.sty
catalogue-ctan /macros/latex/contrib/psfragx
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics graphics-text
catalogue-version 1.1
++++++ psgo.doc.tar.xz ++++++
++++++ psgo.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/psgo.tlpobj new/tlpkg/tlpobj/psgo.tlpobj
--- old/tlpkg/tlpobj/psgo.tlpobj 2016-04-14 19:36:31.000000000 +0200
+++ new/tlpkg/tlpobj/psgo.tlpobj 2017-04-14 17:54:59.000000000 +0200
@@ -6,7 +6,7 @@
runfiles size=3
RELOC/tex/latex/psgo/psgo.sty
catalogue-ctan /graphics/pstricks/contrib/psgo
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-18 16:48:54 +0200
catalogue-license lppl
catalogue-topics games pstricks
catalogue-version 0.17
++++++ psizzl.doc.tar.xz ++++++
++++++ psizzl.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/psizzl.tlpobj new/tlpkg/tlpobj/psizzl.tlpobj
--- old/tlpkg/tlpobj/psizzl.tlpobj 2016-04-14 19:36:31.000000000 +0200
+++ new/tlpkg/tlpobj/psizzl.tlpobj 2017-04-14 17:54:59.000000000 +0200
@@ -27,7 +27,7 @@
RELOC/tex/psizzl/base/thesis.Psizzl
RELOC/tex/psizzl/config/psizzl.ini
catalogue-ctan /macros/psizzl
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics physics format
catalogue-version 0.35
++++++ pslatex.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pslatex.tlpobj new/tlpkg/tlpobj/pslatex.tlpobj
--- old/tlpkg/tlpobj/pslatex.tlpobj 2016-04-14 19:36:31.000000000 +0200
+++ new/tlpkg/tlpobj/pslatex.tlpobj 2017-04-14 17:54:59.000000000 +0200
@@ -27,6 +27,6 @@
RELOC/fonts/vf/public/pslatex/pcrr8tn.vf
RELOC/tex/latex/pslatex/pslatex.sty
catalogue-ctan /macros/latex/contrib/pslatex
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics font-supp obsolete
++++++ psnfss.doc.tar.xz ++++++
++++++ psnfss.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/psnfss.tlpobj new/tlpkg/tlpobj/psnfss.tlpobj
--- old/tlpkg/tlpobj/psnfss.tlpobj 2016-04-14 19:36:31.000000000 +0200
+++ new/tlpkg/tlpobj/psnfss.tlpobj 2017-04-14 17:54:59.000000000 +0200
@@ -145,7 +145,7 @@
RELOC/tex/latex/psnfss/utopia.sty
catalogue-also psnfssx
catalogue-ctan /macros/latex/required/psnfss
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics font-supp font-use
catalogue-version 9.2a
++++++ pspicture.doc.tar.xz ++++++
++++++ pspicture.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pspicture.tlpobj new/tlpkg/tlpobj/pspicture.tlpobj
--- old/tlpkg/tlpobj/pspicture.tlpobj 2016-04-14 19:36:32.000000000 +0200
+++ new/tlpkg/tlpobj/pspicture.tlpobj 2017-04-14 17:55:00.000000000 +0200
@@ -10,6 +10,6 @@
RELOC/dvips/pspicture/pspicture.ps
RELOC/tex/latex/pspicture/pspicture.sty
catalogue-ctan /macros/latex/contrib/pspicture
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics graphics-in-tex obsolete
++++++ pst-2dplot.doc.tar.xz ++++++
++++++ pst-2dplot.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-2dplot.tlpobj new/tlpkg/tlpobj/pst-2dplot.tlpobj
--- old/tlpkg/tlpobj/pst-2dplot.tlpobj 2016-04-14 19:36:32.000000000 +0200
+++ new/tlpkg/tlpobj/pst-2dplot.tlpobj 2017-04-14 17:55:00.000000000 +0200
@@ -9,7 +9,7 @@
runfiles size=2
RELOC/tex/latex/pst-2dplot/pst-2dplot.sty
catalogue-ctan /graphics/pstricks/contrib/pst-2dplot
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics graphics-plot pstricks
catalogue-version 1.5
++++++ pst-3d.doc.tar.xz ++++++
++++++ pst-3d.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-3d.tlpobj new/tlpkg/tlpobj/pst-3d.tlpobj
--- old/tlpkg/tlpobj/pst-3d.tlpobj 2016-04-14 19:36:32.000000000 +0200
+++ new/tlpkg/tlpobj/pst-3d.tlpobj 2017-04-14 17:55:00.000000000 +0200
@@ -11,7 +11,7 @@
RELOC/tex/generic/pst-3d/pst-3d.tex
RELOC/tex/latex/pst-3d/pst-3d.sty
catalogue-ctan /graphics/pstricks/contrib/pst-3d
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics graphics-3d pstricks
catalogue-version 1.10
++++++ pst-3dplot.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-3dplot/Changes new/doc/generic/pst-3dplot/Changes
--- old/doc/generic/pst-3dplot/Changes 2014-08-26 19:30:34.000000000 +0200
+++ new/doc/generic/pst-3dplot/Changes 2017-04-06 02:28:00.000000000 +0200
@@ -1,5 +1,6 @@
pst-3dplot.pro --------
-0.32 2014-02-01 - modifications to coorTape=6
+0.33 2017-04-05 - added coorType=7
+0.32 2014-02-01 - modifications to coorType=6
0.31 2014-01-29 - add coorType=6, like 5 with a z axis vice versa
0.30 2010-01-01 - add the subroutine /tx@ProjThreeD from pst-3d
to get rid of the dependency
@@ -19,6 +20,9 @@
pst-3dplot.tex --------
+2.04 2017-04-05 - added coorType=7
+2.03 2014-12-01 - modifications to coorType=6
+2.02 2014-09-01 - use the alternative for hidden lines of \psThreeDBox
2.01 2014-08-25 - bugfix for \lineIIID@i which is defines by
pst-solides3d, too.
2.00 2014-03-26 - enable opacity setting for sphere and cylinder
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-3dplot/pst-3dplot-doc.bib new/doc/generic/pst-3dplot/pst-3dplot-doc.bib
--- old/doc/generic/pst-3dplot/pst-3dplot-doc.bib 2012-07-29 19:07:14.000000000 +0200
+++ new/doc/generic/pst-3dplot/pst-3dplot-doc.bib 2017-04-06 02:28:00.000000000 +0200
@@ -1,52 +1,114 @@
+%% -*-bibtex-*-
+@STRING{tugboat = {TUGboat} }
@STRING{dtk = {{D}ie {\TeX}nische {K}om{\"o}die} }
+@Book{companion,
+ author = {Michel Goosens and Frank Mittelbach and Sebastian Rahtz and Dennis Roegel and Herbert Vo\ss},
+ title = {The {\LaTeX} {G}raphics {C}ompanion},
+ publisher = {{Addison-Wesley Publishing Company}},
+ edition = {second},
+ year = {2007},
+ address = {Boston, Mass.}
+}
+
+@Article{girou:01:,
+ author = {Denis Girou},
+ title = {Pr\'esentation de {PST}ricks},
+ journal = {Cahier {GUT}enberg},
+ year = 1994,
+ volume = {16},
+ month = apr,
+ pages = {21-70}
+}
+
+@Article{girou:02:,
+ author = {{Timothy Van} Zandt and Denis Girou},
+ title = {Inside {PST}ricks},
+ journal = TUGboat,
+ year = 1994,
+ volume = {15},
+ month = sep,
+ pages = {239-246}
+}
+
@Book{PostScript,
Author = {Kollock, Nikolai G.},
- Title = {PostScript richtig eingesetzt: vom Konzept zum
- praktischen Einsatz},
+ Title = {Post{S}cript richtig eingesetzt: vom {K}onzept zum
+ praktischen {E}insatz},
Publisher = {IWT},
Address = {Vaterstetten},
year = 1989,
}
-@Manual{pstricks,
- Title = {PSTricks - {\PS} macros for Generic TeX},
+@ctan{multido,
+ Title = {\texttt{multido.tex} - a loop macro, that supports fixed-point addition},
Author = {Timothy Van Zandt},
- Organization = {},
- Address = {\url{http://www.tug.org/application/PSTricks}},
+ url = {/macros/generic/multido.tex},
Note = {},
- year = 1993,
+ year = 1997
+}
+
+@Book{PSTricks2,
+ author = {Herbert Vo\ss{}},
+ title = {\texttt{PSTricks} -- {G}rafik f\"ur \TeX{} und \LaTeX},
+ edition = {7},
+ publisher = {DANTE -- Lehmanns},
+ year = {2016},
+ location = {Heidelberg and Berlin}
+}
+
+@Book{PSTricksE,
+ author = {Herbert Vo\ss{}},
+ title = {\texttt{PSTricks} -- {G}raphics and {P}ost{S}cript for \LaTeX},
+ edition = {1},
+ publisher = {UIT},
+ year = {2011},
+ address = {Cambridge -- UK}
}
+@Book{LTXquick,
+ author = {Herbert Vo\ss{}},
+ title = {{\LaTeX} quick reference},
+ edition = {1},
+ publisher = {UIT},
+ year = {2012},
+ address = {Cambridge -- UK}
+}
+
+@Book{presentations,
+ author = {Herbert Vo\ss},
+ title = {Presentations with \LaTeX},
+ edition = {2},
+ publisher = {DANTE -- Lehmanns Media},
+ year = {2017},
+ location = {Heidelberg and Berlin}
+}
+
+
+@Book{tbt,
+ author = {Victor Eijkhout},
+ title = {\TeX\ by Topic -- {A} \TeX{}nician Reference},
+ edition = {1},
+ publisher = {DANTE -- lehmanns media},
+ year = {2014},
+ location = {Heidelberg and Berlin}
+}
-@Manual{pdftricks,
+@online{pdftricks,
Title = {PSTricks Support for pdf},
Author = {Herbert Voss},
- Organization = {},
- Address = {\url{http://PSTricks.de/pdf/pdfoutput.phtml}},
- Note = {},
+ url = {http://PSTricks.de/pdf/pdfoutput.phtml},
year = 2002,
}
-@Manual{miwi,
+@online{miwi,
Title = {References for \TeX{} and Friends},
Author = {Michael Wiedmann and Peter Karp},
- Organization = {},
- Address = {\url{http://www.miwie.org/tex-refs/}},
- Note = {},
+ url = {http://www.miwie.org/tex-refs/},
year = 2003,
}
-@Manual{vue3d:2002,
- Title = {Vue en 3D},
- Author = {Manuel Luque},
- Organization = {},
- Address = {\url{http://members.aol.com/Mluque5130/vue3d16112002.zip}},
- Note = {},
- year = 2002,
-}
-
@Article{dtk02.2:jackson.voss:plot-funktionen,
author = {Laura E. Jackson and Herbert Vo{\ss}},
title = {Die {P}lot-{F}unktionen von {\texttt{pst-plot}}},
@@ -58,7 +120,6 @@
month = jun,
pages = {27--34},
annote = bretter,
- keywords = {},
abstract = { Im letzten Heft wurden die mathematischen Funktionen von
\PS~im Zusammenhang mit dem {\LaTeX}-Paket
\texttt{pst-plot} zum Zeichnen von Funktionen beschrieben
@@ -78,7 +139,6 @@
month = mar,
pages = {40-47},
annote = bretter,
- keywords = {},
abstract = { \PS, faktisch genauso alt wie {\TeX}, ist im
Verh{\"a}ltnis dazu allgemein noch weniger bekannt, wenn es
darum geht zu beurteilen, was es denn nun im eigentlichen
@@ -90,39 +150,3 @@
gezeigt. }
}
-@Book{companion,
- author = {Michel Goosens and Frank Mittelbach and Sebastian Rahtz and Denis Roegel and Herbert Vo{\ss}},
- title = {The {\LaTeX} {G}raphics {C}ompanion},
- publisher = {{Addison-Wesley Publishing Company}},
- edition = second,
- year = {2007},
- address = {Reading, Mass.}
-}
-
-@Book{PSTricks2,
- author = {Herbert Vo\ss{}},
- title = {\texttt{PSTricks} -- {G}rafik f\"ur \TeX{} und \LaTeX},
- edition = {6.},
- publisher = {DANTE -- Lehmanns},
- year = {2010},
- address = {Heidelberg/Hamburg}
-}
-
-@Book{PSTricksE,
- author = {Herbert Vo\ss{}},
- title = {\texttt{PSTricks} -- {G}raphics and {P}ost{S}cript for \LaTeX},
- edition = {1.},
- publisher = {UIT},
- year = {2011},
- address = {Cambridge -- UK}
-}
-
-@Book{LTXquick,
- author = {Herbert Vo\ss{}},
- title = {{\LaTeX} quick reference},
- edition = {1.},
- publisher = {UIT},
- year = {2012},
- address = {Cambridge -- UK}
-}
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-3dplot/pst-3dplot-doc.dat new/doc/generic/pst-3dplot/pst-3dplot-doc.dat
--- old/doc/generic/pst-3dplot/pst-3dplot-doc.dat 2010-02-16 01:35:50.000000000 +0100
+++ new/doc/generic/pst-3dplot/pst-3dplot-doc.dat 2017-04-06 02:28:00.000000000 +0200
@@ -1,4 +1,4 @@
-%% $Id: pst-3dplot-doc.dat 236 2009-12-31 08:59:43Z herbert $
+%% $Id: pst-3dplot-doc.dat 402 2017-04-05 06:58:06Z herbert $
\begin{filecontents}{data3D.Roessler}
2.0, 0.0, 0.0
1.9737089990827656, 0.31348417289942826, 0.024766924774833776
Binary files old/doc/generic/pst-3dplot/pst-3dplot-doc.pdf and new/doc/generic/pst-3dplot/pst-3dplot-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-3dplot/pst-3dplot-doc.tex new/doc/generic/pst-3dplot/pst-3dplot-doc.tex
--- old/doc/generic/pst-3dplot/pst-3dplot-doc.tex 2014-02-02 00:14:20.000000000 +0100
+++ new/doc/generic/pst-3dplot/pst-3dplot-doc.tex 2017-04-06 02:28:00.000000000 +0200
@@ -1,11 +1,15 @@
\input{pst-3dplot-doc.dat}
-%% $Id: pst-3dplot-doc.tex 882 2014-02-01 13:12:37Z herbert $
+%% $Id: pst-3dplot-doc.tex 401 2017-04-05 06:57:36Z herbert $
\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
headexclude,footexclude,oneside,dvipsnames,svgnames]{pst-doc}
\listfiles
\usepackage[utf8]{inputenc}
+
+\usepackage{biblatex}
+\addbibresource{\jobname.bib}
+
\usepackage{pst-grad,pst-3dplot}
\let\pstFV\fileversion
\let\belowcaptionskip\abovecaptionskip
@@ -15,6 +19,7 @@
%\usepackage{tabularx}
%\usepackage{longtable}
%
+
\makeatletter
\renewcommand*\l@subsection{\bprot@dottedtocline{2}{1.5em}{3.6em}}
\renewcommand*\l@subsubsection{\bprot@dottedtocline{3}{3.8em}{4.5em}}
@@ -511,7 +516,7 @@
\label{exa:coorType}\xLkeyword{coorType}
\begin{LTXexample}[width=9.75cm]
\psset{coorType=1,Alpha=135}
-\begin{pspicture}(-2,-3)(3,3)
+\begin{pspicture}(-2,-3)(3,3.5)
\pstThreeDCoor[IIIDticks,zMax=3]%
\end{pspicture}
\end{LTXexample}
@@ -528,7 +533,7 @@
\begin{LTXexample}[width=9.75cm]
\psset{coorType=2,Alpha=90,
IIIDxTicksPlane=yz}
-\begin{pspicture}(-2,-2)(3,3)
+\begin{pspicture}(-2,-2)(3,3.5)
\pstThreeDCoor[IIIDticks,zMax=3]%
\end{pspicture}
\end{LTXexample}
@@ -540,7 +545,7 @@
\begin{LTXexample}[width=9.75cm]
\psset{coorType=3,Alpha=90,
IIIDxTicksPlane=yz}
-\begin{pspicture}(-2,-2)(3,3)
+\begin{pspicture}(-2,-2)(3,3.5)
\pstThreeDCoor[IIIDticks,zMax=3]%
\end{pspicture}
\end{LTXexample}
@@ -550,12 +555,12 @@
\begin{LTXexample}[width=9.75cm]
\psset{coorType=4,IIIDxTicksPlane=yz}
-\begin{pspicture}(-2,-2)(3,3)
+\begin{pspicture}(-2,-2)(3,3.5)
\pstThreeDCoor[IIIDticks,zMax=3]%
\end{pspicture}
\end{LTXexample}
-With \Lkeyword{coorType}=5 the y--z-axes are orthogonal and the angle between x- and y-axis
+With \Lkeyword{coorType}=5 the $y$-$z$-axes are orthogonal and the angle between x- and y-axis
is variable but should be 30 or 45 degrees and the x-axis is shortened by a factor of $0.5$.
The angle \Lkeyword{Beta} is not valid.
@@ -563,11 +568,14 @@
\begin{LTXexample}[width=9.75cm]
\psset{coorType=5,Alpha=30,
IIIDxTicksPlane=yz}
-\begin{pspicture}(-2,-2)(3,3)
+\begin{pspicture}(-2,-2)(3,4)
\pstThreeDCoor[IIIDticks,zMax=3]%
\end{pspicture}
\end{LTXexample}
+
+For \Lkeyword{coorType}=6 the $x$-axis us shortend by 0.559.
+
%\setIIIDplotDefaults
\psset{unit=1cm}
\xLkeyword{coorType}
@@ -585,7 +593,24 @@
\end{pspicture}
\end{LTXexample}
+For \Lkeyword{coorType}=7 the $x$-axis us shortend by 0.5.
+%\setIIIDplotDefaults
+\psset{unit=1cm}
+\xLkeyword{coorType}
+\begin{LTXexample}[width=9cm]
+\psset{coorType=7}
+\begin{pspicture}(-3,-2)(6,6)
+\psset{IIIDxTicksPlane=xz,IIIDyTicksPlane=yz}
+\pstThreeDCoor[xMin=0,xMax=5,yMin=0,yMax=5,
+ zMin=0,zMax=5,IIIDticks,spotX=180,
+ IIIDlabels=false,linecolor=red]%
+\multido{\iA=1+1}{4}{\footnotesize%
+ \pstThreeDPut(\iA,-0.3,0.1){\iA}%
+ \pstThreeDPut(-0.3,\iA,0.1){\iA}%
+ \pstThreeDPut(0,-0.3,\iA){\iA}}
+\end{pspicture}
+\end{LTXexample}
\clearpage
\section{Rotation}
@@ -2457,9 +2482,8 @@
\bgroup
\nocite{*}
-\raggedright
-\bibliographystyle{plain}
-\bibliography{pst-3dplot-doc}
+\RaggedRight
+\printbibliography
\egroup
\printindex
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-3dplot.doc.tlpobj new/tlpkg/tlpobj/pst-3dplot.doc.tlpobj
--- old/tlpkg/tlpobj/pst-3dplot.doc.tlpobj 2016-04-14 19:36:32.000000000 +0200
+++ new/tlpkg/tlpobj/pst-3dplot.doc.tlpobj 2017-04-14 17:55:00.000000000 +0200
@@ -1,9 +1,9 @@
name pst-3dplot.doc
category Package
-revision 35042
+revision 43703
shortdesc doc files of pst-3dplot
relocated 1
-docfiles size=751
+docfiles size=772
RELOC/doc/generic/pst-3dplot/Changes
RELOC/doc/generic/pst-3dplot/README
RELOC/doc/generic/pst-3dplot/pst-3dplot-doc.bib
++++++ pst-3dplot.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dvips/pst-3dplot/pst-3dplot.pro new/dvips/pst-3dplot/pst-3dplot.pro
--- old/dvips/pst-3dplot/pst-3dplot.pro 2014-02-02 00:14:20.000000000 +0100
+++ new/dvips/pst-3dplot/pst-3dplot.pro 2017-04-06 02:28:00.000000000 +0200
@@ -1,4 +1,4 @@
-%% $Id: pst-3dplot.pro 882 2014-02-01 13:12:37Z herbert $
+%% $Id: pst-3dplot.pro 401 2017-04-05 06:57:36Z herbert $
%%
%% This is file `pst-3dplot.pro',
%%
@@ -16,7 +16,7 @@
%% `pst-3dplot' is a PSTricks package to draw 3d curves and graphical objects
%%
%%
-%% version 0.32 / 2014-02-01 Herbert Voss <hvoss _at_ tug.org>
+%% version 0.33 / 2017-04-05 Herbert Voss <hvoss _at_ tug.org>
%% with contributions of Darrell Lamm 270pt
+ \pstThreeDSquare(\pst@tempX #7 add,\pst@tempY #8 add,\pst@tempZ #9 add)(#1,#2,#3)(#4,#5,#6)% front square
+ \else
+ \pstThreeDSquare(\pst@tempX,\pst@tempY,\pst@tempZ)(#1,#2,#3)(#4,#5,#6)% back square
+ \fi
+ \fi
+ \ifPst@hiddenLine\psset{linestyle=\psk@ThreeDplot@invisibleLineStyle}\fi
\pstThreeDSquare(\pst@tempX #4 add,\pst@tempY #5 add,\pst@tempZ #6 add)(#1,#2,#3)(#7,#8,#9)% left square
\pstThreeDSquare(\pst@tempX #1 add,\pst@tempY #2 add,\pst@tempZ #3 add)(#4,#5,#6)(#7,#8,#9)% top square
\ifdim\pst@dimo<90pt
@@ -972,12 +973,64 @@
\pstThreeDSquare(\pst@tempX #7 add,\pst@tempY #8 add,\pst@tempZ #9 add)(#1,#2,#3)(#4,#5,#6)% front square
\else
\pstThreeDSquare(\pst@tempX,\pst@tempY,\pst@tempZ)(#1,#2,#3)(#4,#5,#6)% back square
- \fi%
+ \fi
+ \else
+ \ifdim\pst@dimo>270pt
+ \pstThreeDSquare(\pst@tempX,\pst@tempY,\pst@tempZ)(#1,#2,#3)(#4,#5,#6)% back square
+ \else
+ \pstThreeDSquare(\pst@tempX #7 add,\pst@tempY #8 add,\pst@tempZ #9 add)(#1,#2,#3)(#4,#5,#6)% front square
+ \fi
\fi%
-\fi%
- \endgroup%
- \ignorespaces%
+\else
+ \ifnum\psk@ThreeDplot@coorType=3
+ \ifPst@hiddenLine
+ \psset{linestyle=\psk@ThreeDplot@invisibleLineStyle}
+ \pstThreeDLine(\pst@tempX,\pst@tempY,\pst@tempZ)(\pst@tempX #1 add,\pst@tempY,\pst@tempZ)(\pst@tempX #1 add,\pst@tempY #5 add,\pst@tempZ)
+ \pstThreeDLine(\pst@tempX #1 add,\pst@tempY,\pst@tempZ)(\pst@tempX #1 add,\pst@tempY,\pst@tempZ #9 add)
+ \psset{linestyle=\psk@ThreeDplot@visibleLineStyle}
+ \else
+ \pstThreeDSquare(\pst@tempX,\pst@tempY,\pst@tempZ)(#1,#2,#3)(#4,#5,#6)% bottom square
+ \pstThreeDSquare(\pst@tempX #1 add,\pst@tempY #2 add,\pst@tempZ #3 add)(#4,#5,#6)(#7,#8,#9)% left square
+ \fi
+ \pstThreeDSquare(\pst@tempX #4 add,\pst@tempY #5 add,\pst@tempZ #6 add)(#1,#2,#3)(#7,#8,#9)% right square
+ \pstThreeDSquare(\pst@tempX #7 add,\pst@tempY #8 add,\pst@tempZ #9 add)(#1,#2,#3)(#4,#5,#6)% top square
+ \pstThreeDSquare(\pst@tempX,\pst@tempY,\pst@tempZ)(#4,#5,#6)(#7,#8,#9)% right square
+ \else
+ \ifnum\psk@ThreeDplot@coorType=5
+ \ifPst@hiddenLine
+ \psset{linestyle=\psk@ThreeDplot@invisibleLineStyle}
+ \pstThreeDLine(\pst@tempX,\pst@tempY,\pst@tempZ)(\pst@tempX,\pst@tempY,\pst@tempZ #9 add)(\pst@tempX #1 add,\pst@tempY,\pst@tempZ #9 add)
+ \pstThreeDLine(\pst@tempX,\pst@tempY,\pst@tempZ #9 add)(\pst@tempX,\pst@tempY #5 add,\pst@tempZ #9 add)
+ \psset{linestyle=\psk@ThreeDplot@visibleLineStyle}
+ \else
+ \pstThreeDSquare(\pst@tempX #7 add,\pst@tempY #8 add,\pst@tempZ #9 add)(#1,#2,#3)(#4,#5,#6)% top square
+ \pstThreeDSquare(\pst@tempX,\pst@tempY,\pst@tempZ)(#4,#5,#6)(#7,#8,#9)% right square
+ \fi
+ \pstThreeDSquare(\pst@tempX,\pst@tempY,\pst@tempZ)(#1,#2,#3)(#4,#5,#6)% bottom square
+ \pstThreeDSquare(\pst@tempX #4 add,\pst@tempY #5 add,\pst@tempZ #6 add)(#1,#2,#3)(#7,#8,#9)% top square
+ \pstThreeDSquare(\pst@tempX #1 add,\pst@tempY #2 add,\pst@tempZ #3 add)(#4,#5,#6)(#7,#8,#9)% left square
+ \else
+ \pstThreeDSquare(\pst@tempX #1 add,\pst@tempY #2 add,\pst@tempZ #3 add)(#4,#5,#6)(#7,#8,#9)% left square
+ \pstThreeDSquare(\pst@tempX #4 add,\pst@tempY #5 add,\pst@tempZ #6 add)(#1,#2,#3)(#7,#8,#9)% front square
+ \pstThreeDSquare(\pst@tempX #7 add,\pst@tempY #8 add,\pst@tempZ #9 add)(#1,#2,#3)(#4,#5,#6)% top square
+ \ifPst@hiddenLine
+% \psset{}
+ \pstThreeDLine[linestyle=\psk@ThreeDplot@invisibleLineStyle](\pst@tempX #1 add,\pst@tempY,\pst@tempZ)(\pst@tempX,\pst@tempY,\pst@tempZ)(\pst@tempX,\pst@tempY #5 add,\pst@tempZ)
+ \pstThreeDLine[linestyle=\psk@ThreeDplot@invisibleLineStyle](\pst@tempX,\pst@tempY,\pst@tempZ)(\pst@tempX,\pst@tempY,\pst@tempZ #9 add)
+% \psset{linestyle=\psk@ThreeDplot@visibleLineStyle}
+ \else
+ \pstThreeDSquare(\pst@tempX,\pst@tempY,\pst@tempZ)(#1,#2,#3)(#4,#5,#6)% bottom square
+ \pstThreeDSquare(\pst@tempX,\pst@tempY,\pst@tempZ)(#4,#5,#6)(#7,#8,#9)% right square
+ \fi
+ \fi
+ \fi
+\fi
+ \endgroup
+ \ignorespaces
}
+%
+
+
\define@key[psset]{pst-3dplot}{height}[5]{\def\psk@height{#1 }}
\define@key[psset]{pst-3dplot}{move}[0 0]{\def\psk@move{#1 }}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pst-3dplot/pst-3dplot.sty new/tex/latex/pst-3dplot/pst-3dplot.sty
--- old/tex/latex/pst-3dplot/pst-3dplot.sty 2011-03-03 01:38:36.000000000 +0100
+++ new/tex/latex/pst-3dplot/pst-3dplot.sty 2017-04-06 02:28:00.000000000 +0200
@@ -1,4 +1,4 @@
-%% $Id: pst-3dplot.sty 294 2010-02-18 21:15:47Z herbert $
+%% $Id: pst-3dplot.sty 401 2017-04-05 06:57:36Z herbert $
\RequirePackage{pstricks}
\RequirePackage{pst-3d}
\RequirePackage{pst-plot}
@@ -9,7 +9,7 @@
\input{pst-3dplot.tex}
\IfFileExists{pst-3dplot.pro}{%
\ProvidesFile{pst-3dplot.pro}
- [2010/01/01 v. 0.30, PostScript prologue file (hv)]
+ [2017/04/05 v. 0.33, PostScript prologue file (hv)]
\@addtofilelist{pst-3dplot.pro}}{}%
\ProvidesFile{pst-3dplot.tex}
[\filedate\space v\fileversion\space `PST-3dplot' (hv)]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-3dplot.tlpobj new/tlpkg/tlpobj/pst-3dplot.tlpobj
--- old/tlpkg/tlpobj/pst-3dplot.tlpobj 2016-04-14 19:36:34.000000000 +0200
+++ new/tlpkg/tlpobj/pst-3dplot.tlpobj 2017-04-14 17:55:01.000000000 +0200
@@ -1,6 +1,6 @@
name pst-3dplot
category Package
-revision 35042
+revision 43703
shortdesc Draw 3D objects in parallel projection, using PSTricks
relocated 1
longdesc A package using PSTricks to draw a large variety of graphs and
@@ -12,7 +12,7 @@
RELOC/tex/generic/pst-3dplot/pst-3dplot.tex
RELOC/tex/latex/pst-3dplot/pst-3dplot.sty
catalogue-ctan /graphics/pstricks/contrib/pst-3dplot
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2017-04-05 10:29:03 +0200
catalogue-license lppl
catalogue-topics graphics-3d graphics-plot pstricks
-catalogue-version 2.01
+catalogue-version 2.04
++++++ pst-abspos.doc.tar.xz ++++++
++++++ pst-abspos.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-abspos.tlpobj new/tlpkg/tlpobj/pst-abspos.tlpobj
--- old/tlpkg/tlpobj/pst-abspos.tlpobj 2016-04-14 19:36:34.000000000 +0200
+++ new/tlpkg/tlpobj/pst-abspos.tlpobj 2017-04-14 17:55:01.000000000 +0200
@@ -10,7 +10,7 @@
RELOC/tex/generic/pst-abspos/pst-abspos.tex
RELOC/tex/latex/pst-abspos/pst-abspos.sty
catalogue-ctan /graphics/pstricks/contrib/pst-abspos
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics layout pstricks
catalogue-version 0.2
++++++ pst-am.doc.tar.xz ++++++
++++++ pst-am.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-am.tlpobj new/tlpkg/tlpobj/pst-am.tlpobj
--- old/tlpkg/tlpobj/pst-am.tlpobj 2016-04-14 19:36:35.000000000 +0200
+++ new/tlpkg/tlpobj/pst-am.tlpobj 2017-04-14 17:55:01.000000000 +0200
@@ -10,7 +10,7 @@
runfiles size=3
RELOC/tex/latex/pst-am/pst-am.sty
catalogue-ctan /graphics/pstricks/contrib/pst-am
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics diagram pstricks
catalogue-version 1.02
++++++ pst-asr.doc.tar.xz ++++++
++++++ pst-asr.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-asr.tlpobj new/tlpkg/tlpobj/pst-asr.tlpobj
--- old/tlpkg/tlpobj/pst-asr.tlpobj 2016-04-14 19:36:35.000000000 +0200
+++ new/tlpkg/tlpobj/pst-asr.tlpobj 2017-04-14 17:55:01.000000000 +0200
@@ -9,7 +9,7 @@
RELOC/tex/generic/pst-asr/pst-asr.tex
RELOC/tex/latex/pst-asr/pst-asr.sty
catalogue-ctan /graphics/pstricks/contrib/pst-asr
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics linguistic pstricks
catalogue-version 1.3
++++++ pst-bar.doc.tar.xz ++++++
++++++ pst-bar.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-bar.tlpobj new/tlpkg/tlpobj/pst-bar.tlpobj
--- old/tlpkg/tlpobj/pst-bar.tlpobj 2016-04-14 19:36:36.000000000 +0200
+++ new/tlpkg/tlpobj/pst-bar.tlpobj 2017-04-14 17:55:02.000000000 +0200
@@ -13,7 +13,7 @@
RELOC/tex/generic/pst-bar/pst-bar.tex
RELOC/tex/latex/pst-bar/pst-bar.sty
catalogue-ctan /graphics/pstricks/contrib/pst-bar
-catalogue-date 2015-08-15 05:39:34 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics genchart pstricks
catalogue-version 0.92
++++++ pst-barcode.doc.tar.xz ++++++
++++ 70500 lines of diff (skipped)
++++++ pst-barcode.tar.xz ++++++
++++ 2367 lines of diff (skipped)
++++++ pst-bezier.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-bezier/Changes new/doc/generic/pst-bezier/Changes
--- old/doc/generic/pst-bezier/Changes 2009-01-30 01:07:44.000000000 +0100
+++ new/doc/generic/pst-bezier/Changes 2016-11-25 19:27:47.000000000 +0100
@@ -1,10 +1,17 @@
-- pst-bezier.tex ---
+0.03 2016-09-03 small changes to the code, correct url in
+ the documentation
+0.02 2016-08-19 added macro \psRQBCmasse for a Bezier curve,
+ definied by three weighted points
0.01 2009-01-29 first CTAN version
-- pst-bezier.sty ---
+0.02 2016-08-19 - load expl3 for floating point operations
+ - define \pscalculation
0.01 2009-01-29 first CTAN version
-- pst-bezier.pro ---
+0.02 2016-08-19 added function tx@RQBCmasse for a Bezier curve
0.01 2009-01-29 first CTAN version
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-bezier/README new/doc/generic/pst-bezier/README
--- old/doc/generic/pst-bezier/README 2009-01-30 01:07:44.000000000 +0100
+++ new/doc/generic/pst-bezier/README 1970-01-01 01:00:00.000000000 +0100
@@ -1,42 +0,0 @@
-Save the files pst-bezier.sty|tex in a directory, which is part of your
-local TeX tree. pst-bezier.pro should be saved in ../texmf/dvips/pstricks/
-Then do not forget to run texhash to update this tree.
-pst-bezier needs pst-plot and pst-tricks, which should be part of your
-local TeX installation, otherwise get it from a CTAN server, f.ex.
-http://www.CTAN.org
-
-
-Save the files
-
-pst-bezier.sty
-pst-bezier.tex
-pst-bezier.pro
-
-in any place, where latex or any other TeX program will find it.
-Do not forget to update your database, when installing this
-package the first time.
-
-pst-bezier uses the extended version of the keyval package. So
-be sure that you
-- have installed xkeyval with the special pst-xkey
- (CTAN: tex-archive/macros/latex/contrib/xkeyval/)
-- do not load another package after pst-bezier, which loads
- the old keyval.sty or pst-key.tex
-
-
-If you like to get the documentation file in another format run
-
-latex pst-bezier-doc.tex
-bibtex pst-bezier.doc
-latex pst-bezier-doc.tex
-dvips pst-bezier-doc.dvi
-
-to get a PostScript file. But pay attention, that the pst-bezier
-files are saved in the above mentioned way, before you run
-latex on the documentation file.
-
-The intermediate DVI file works only with viewers which can
-interprete the embedded PostScript code.
-
-For another PDF output read the Introduction from
-the documentation.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-bezier/README.md new/doc/generic/pst-bezier/README.md
--- old/doc/generic/pst-bezier/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/generic/pst-bezier/README.md 2016-11-25 19:27:47.000000000 +0100
@@ -0,0 +1,39 @@
+Save the files pst-bezier.sty|tex in a directory, which is part of your
+local TeX tree. pst-bezier.pro should be saved in ../texmf/dvips/pstricks/
+Then do not forget to run texhash to update this tree.
+pst-bezier needs pst-plot and pstricks, which should be part of your
+local TeX installation, otherwise get it from a CTAN server
+http://mirror.CTAN.org
+
+
+Save the files
+
+pst-bezier.sty
+pst-bezier.tex
+pst-bezier.pro
+
+in any place, where latex or any other TeX program will find it.
+Do not forget to update your database, when installing this
+package the first time.
+
+pst-bezier uses the extended version of the keyval package. So
+be sure that you
+- have installed xkeyval with the special pst-xkey
+ (CTAN: tex-archive/macros/latex/contrib/xkeyval/)
+- do not load another package after pst-bezier, which loads
+ the old keyval.sty or pst-key.tex
+
+
+If you like to get the documentation file in another format run
+
+latex pst-bezier-doc.tex
+bibtex pst-bezier.doc
+latex pst-bezier-doc.tex
+dvips pst-bezier-doc.dvi
+
+to get a PostScript file. But pay attention, that the pst-bezier
+files are saved in the above mentioned way, before you run
+latex on the documentation file.
+
+The intermediate DVI file works only with viewers which can
+interprete the embedded PostScript code.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-bezier/pst-bezier-doc.bib new/doc/generic/pst-bezier/pst-bezier-doc.bib
--- old/doc/generic/pst-bezier/pst-bezier-doc.bib 2009-01-30 01:07:44.000000000 +0100
+++ new/doc/generic/pst-bezier/pst-bezier-doc.bib 2016-11-25 19:27:47.000000000 +0100
@@ -1,110 +1,148 @@
-@STRING{dtk = {{D}ie {\TeX}nische {K}om{\"o}die} }
+@STRING{tugboat = {TUGboat} }
+@STRING{beiprogramm = {{\TeX}-Beiprogramm} }
+@STRING{bretter = {Bretter, die die Welt bedeuten} }
+@STRING{dtk = {{D}ie {\TeX}nische {K}om{\"o}die} }
+@STRING{editorial = {Editorial} }
+@STRING{fremdebuehne = {Von fremden B{\"u}hnen} }
+@STRING{fundus = {Aus dem Fundus} }
+@STRING{hinterbuehne = {Hinter der B{\"u}hne} }
+@STRING{leserbrief = {Leserbrief(e)} }
+@STRING{magazin = {Magazin} }
+@STRING{rezension = {Rezensionen} }
+@STRING{schonimmer = {Was Sie schon immer {\"u}ber {\TeX} wissen wollten \dots} }
+@STRING{theaterkasse = {Von der Theaterkasse} }
+@STRING{theatertage = {{\TeX}-Theatertage} }
-@Book{PostScript,
- Author = {Kollock, Nikolai G.},
- Title = {PostScript richtig eingesetzt: vom Konzept zum
- praktischen Einsatz},
- Publisher = {IWT},
- Address = {Vaterstetten},
- year = 1989,
+@Book{PSTricks2,
+ author = {Herbert Vo\ss},
+ title = {{\PST} {G}rafik für \TeX{} und \LaTeX},
+ edition = {7},
+ publisher = {DANTE -- Lehmanns},
+ year = {2016},
+ address = {Heidelberg/Berlin}
}
-@Manual{pstricks,
- Title = {PSTricks - {\PS} macros for Generic TeX},
- Author = {Timothy Van Zandt},
- Organization = {},
- Address = {\url{http://www.tug.org/application/PSTricks}},
- Note = {},
- year = 1993,
-}
-
-
-@Manual{pdftricks,
- Title = {PSTricks Support for pdf},
- Author = {Herbert Voss},
- Organization = {},
- Address = {\url{http://PSTricks.de/pdf/pdfoutput.phtml}},
- Note = {},
- year = 2002,
-}
-
-@Manual{miwi,
- Title = {References for \TeX{} and Friends},
- Author = {Michael Wiedmann and Peter Karp},
- Organization = {},
- Address = {\url{http://www.miwie.org/tex-refs/}},
- Note = {},
- year = 2003,
-}
-
-
-@Article{dtk02.2:jackson.voss:plot-funktionen,
- author = {Laura E. Jackson and Herbert Vo{\ss}},
- title = {Die {P}lot-{F}unktionen von {\texttt{pst-plot}}},
- journal = dtk,
- year = 2002,
- volume = {2/02},
- altvolume = 2,
- altnumber = 14,
- month = jun,
- pages = {27--34},
- annote = bretter,
- keywords = {},
- abstract = { Im letzten Heft wurden die mathematischen Funktionen von
- \PS~im Zusammenhang mit dem {\LaTeX}-Paket
- \texttt{pst-plot} zum Zeichnen von Funktionen beschrieben
- und durch Beispiele erl{\"a}utert. In diesem Teil werden
- die bislang nur erw{\"a}hnten Plot-Funktionen f{\"u}r
- externe Daten behandelt. }
-}
-
-@Article{dtk02.1:voss:mathematischen,
- author = {Herbert Vo{\ss}},
- title = {Die mathematischen {F}unktionen von {P}ostscript},
- journal = dtk,
- year = 2002,
- volume = {1/02},
- altvolume = 1,
- altnumber = 14,
- month = mar,
- pages = {40-47},
- annote = bretter,
- keywords = {},
- abstract = { \PS, faktisch genauso alt wie {\TeX}, ist im
- Verh{\"a}ltnis dazu allgemein noch weniger bekannt, wenn es
- darum geht zu beurteilen, was es denn nun im eigentlichen
- Sinne ist. Au{\ss}erdem wird h{\"a}ufig vergessen, dass
- sich mit den \PS-Funktionen viele Dinge erledigen lassen,
- bei denen sonst auf externe Programme zur{\"u}ckgegriffen
- wird. Dies wird im Folgenden f{\"u}r die mathematischen
- Funktionen im Zusammenhang mit dem Paket \texttt{pst-plot}
- gezeigt. }
+@Book{PSTricks-E,
+ author = {Herbert Vo\ss},
+ title = {{\PST} {G}raphics for \LaTeX},
+ edition = {1},
+ publisher = {UIT},
+ year = {2011},
+ address = {Cambridge}
+}
+
+@Book{companion04,
+ author = {Frank Mittelbach and Michel Goosens et al},
+ title = {The {\LaTeX} {C}ompanion},
+ edition = {second},
+ publisher = {Addison-Wesley Publishing Company},
+ year = {2004},
+ address = {Boston}
+}
+
+@Book{unbound,
+ author = {Alan Hoenig},
+ title = {\TeX{} {U}nbound: \LaTeX{} \& \TeX{} {S}trategies, {F}onts, {G}raphics, and {M}ore},
+ publisher = {Oxford University Press},
+ year = {1998},
+ address = {London}
}
-
-@Book{companion,
- author = {Michel Goosens and Frank Mittelbach and Serbastian Rahtz and Denis Roegel and Herbert Vo\ss},
+@Book{tlgc2,
+ author = {Michel Goosens and Frank Mittelbach and Sebastian Rahtz and Denis Roegel and Herbert Vo{\ss}},
title = {The {\LaTeX} {G}raphics {C}ompanion},
publisher = {{Addison-Wesley Publishing Company}},
+ edition = 2,
year = {2007},
- edition = {2nd},
address = {Reading, Mass.}
}
-@Book{PSTricks2,
- author = {Herbert Vo\ss},
- title = {\texttt{PSTricks} -- {G}rafik f\"ur \TeX{} und \LaTeX},
- edition = {5.},
- publisher = {DANTE/Lehmanns Media},
- year = {2008},
- address = {Heidelberg/Berlin}
+@Article{girou:01:,
+ author = {Denis Girou},
+ title = {Pr\'esentation de {PST}ricks},
+ journal = {Cahier {GUT}enberg},
+ year = 1994,
+ volume = {16},
+ month = apr,
+ pages = {21--70}
+}
+
+@Article{girou:02:,
+ author = {{Timothy Van} Zandt and Denis Girou},
+ title = {Inside {PST}ricks},
+ journal = TUGboat,
+ year = 1994,
+ volume = {15},
+ month = sep,
+ pages = {239--246}
}
-@Book{voss:math,
- author = {Herbert Vo\ss},
- title = {Mathematik mit \LaTeX},
- publisher = {{DANTE/Lehmanns Media}},
- year = {2009},
- address = {Heidelberg/Berlin}
+@Book{PostScript,
+ Author = {Kollock, Nikolai G.},
+ Title = {PostScript richtig eingesetzt: vom {K}onzept zum
+ praktischen {E}insatz},
+ Publisher = {IWT},
+ Address = {Vaterstetten},
+ year = 1989,
+}
+
+@online{pstricks,
+ Title = {PSTricks - {\PS} macros for generic {\TeX}},
+ Author = {{Timothy Van} Zandt},
+ Organization = {\TeX\ Users Group},
+ url = {http://www.tug.org/application/PSTricks},
+ urldate={2016-08-21},
+ year = 1993
+}
+
+@ctan{pst-plot,
+ Title = {\texttt{pst-plot}: Plotting two dimensional functions and data},
+ Author = {{Timothy Van} Zandt and Herbert Voß},
+ Organization = {CTAN},
+ url = {graphics/pstricks/generic/pst-plot.tex},
+ year = 2016
+}
+
+@ctan{multido,
+ Title = {\texttt{multido.tex} - a loop macro, that supports fixed-point addition},
+ Author = {{Timothy Van} Zandt},
+ Organization = {CTAN},
+ url = {/graphics/pstricks/generic/multido.tex},
+ year = 1997
+}
+
+@inproceedings{GB16,
+ TITLE = {Mass points, {B}\'ezier curves and conics: a survey},
+ AUTHOR = {Lionel Garnier and Jean-Paul Bécar},
+ url = {http://ufrsciencestech.u-bourgogne.fr/~garnier/publications/adg2016/},
+ BOOKTITLE = {Eleventh International Workshop on Automated Deduction in Geometry},
+ ADDRESS = {Strasbourg, France},
+ SERIES = {Proceedings of ADG 2016},
+ PAGES = {97--116},
+ date = {2016-06},
+ urldate={2016-08-20},
+}
+
+@online{gb16a,
+ author={Lionel Garnier},
+ title={Courbes de Bézier et coniques},
+ url={http://ufrsciencestech.u-bourgogne.fr/~garnier/Migs/03_CourbesBezierPointsMassiquesEleve.pdf},
+ urldate={2016-08-20},
+}
+@online{gb16b,
+ author={Lionel Garnier and Jean-Paul Bécar and Lucie Drouton},
+ title={Surfaces canal et courbes de Bézier rationnelles quadratiques},
+ journal={Journées du Groupe de Travail en Modélisation Géométrique 2016},
+ address={Dijon},
+ url={http://ufrsciencestech.u-bourgogne.fr/~garnier/publications/hippocampe/64_GTMG2016_courbesBezierSurfacesCanal.pdf},
+ urldate={2016-08-20},
+}
+
+@PhdThesis{Bec97,
+author = {Jean-Paul Bécar},
+title = {Forme ({B}{R}) des coniques et de leurs faisceaux},
+school = {Université de Valenciennes et de Hainaut-Cambrésis, LIMAV},
+date = {1997-12-12},
+address= {Valenciennes, France},
}
Binary files old/doc/generic/pst-bezier/pst-bezier-doc.pdf and new/doc/generic/pst-bezier/pst-bezier-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-bezier/pst-bezier-doc.tex new/doc/generic/pst-bezier/pst-bezier-doc.tex
--- old/doc/generic/pst-bezier/pst-bezier-doc.tex 2009-01-30 01:07:44.000000000 +0100
+++ new/doc/generic/pst-bezier/pst-bezier-doc.tex 2016-11-25 19:27:47.000000000 +0100
@@ -1,21 +1,35 @@
-%% $Id: pst-bezier-doc.tex 86 2009-01-29 10:34:00Z herbert $
-\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
- headexclude,footexclude,oneside]{pst-doc}
+%% $Id: pst-bezier-doc.tex 134 2009-09-27 12:28:50Z herbert $
+\documentclass[11pt,english,bibliography=totoc,parskip=false,smallheadings,
+ oneside]{pst-doc}
\usepackage[utf8]{inputenc}
-\usepackage{pst-bezier}
\usepackage{esvect}
\let\vec\vv
+\usepackage{animate}
+\usepackage{pst-bezier}
+\usepackage{bbold}
+\addbibresource{pst-bezier-doc.bib}
\let\pstBezierFV\fileversion
\lstset{pos=l,wide=false,language=PSTricks,
morekeywords={multidipole,parallel},basicstyle=\footnotesize\ttfamily}
+\definecolor{navy}{rgb}{0 0 0.5}
%
+\def\bgImage{\pspicture[showgrid](0,1)(5,6)
+\psset{showpoints}
+\psbcurve[linecolor=blue,linewidth=0.01](1,1)%
+ (2,2)(3,1)(4,2)(4,4)(3,5)%
+ (2,4)(1,5)
+\psbcurve(1,1)(2,2)(3,1)(4,2)%
+ T{0.5}(4,4)(3,5)(2,4)(1,5)
+\endpspicture}
+\newtheorem{definition}{Definition}
+\def\dy{\displaystyle}
\begin{document}
\title{\texttt{pst-bezier}}
\subtitle{A PSTricks package for drawing Bezier curves; v.\pstBezierFV}
-\author{Tobias Nähring \\Herbert Vo\ss}
-\docauthor{}
+\author{Jean-Paul Bécar\\Lionel Garnier\\Manuel Luque\\Tobias Nähring \\Herbert Voß}
+\docauthor{Lionel Garnier\\Herbert Voß}
\date{\today}
\maketitle
@@ -37,7 +51,7 @@
points. Note that some control is possible via the
\Lkeyword{curvature} option.
-The \Lcs{psbezier} macro gives full control over the
+The \Lcs{psbcurve} macro gives full control over the
interpolation points and the control points of one Bezier polynominal
of degree three (two interpolated points and two control
points).
@@ -47,7 +61,7 @@
Jean-C\^ome Charpentier.
\end{abstract}
-%% Author: Tobias N"ahring
+\clearpage
\section{Introduction}
@@ -95,7 +109,7 @@
\usepackage{pstricks}
\usepackage{pst-bezier}
\begin{document}
- \begin{pspicture}(6,4)
+ \begin{pspicture}(0,-0.4)(6,2)
\psbcurve(1,2)(5,2) % Draw just one straight line.
\end{pspicture}
\end{document}
@@ -107,8 +121,8 @@
points as the argument of \Lcs{psbcurve}.
\begin{LTXexample}
-\begin{pspicture}[showgrid=true](5,3)
- \psbcurve(1,1)(2,2)(3,1)(4,2)
+\begin{pspicture}[showgrid](0,-0.4)(5,3)
+ \psbcurve[showpoints](1,1)(2,2)(3,1)(4,2)
\end{pspicture}
\end{LTXexample}
@@ -116,8 +130,8 @@
\begin{LTXexample}
-\begin{pspicture}[showgrid=true](5,3)
- \psbcurve[showpoints=true](1,1)(2,2)(3,1)(4,2)
+\begin{pspicture}[showgrid](0,-0.4)(5,3)
+ \psbcurve[showpoints](1,1)(2,2)(3,1)(4,2)
\end{pspicture}
\end{LTXexample}
@@ -129,8 +143,8 @@
description, it is not a feature of \Lcs{psbcurve}).
\begin{LTXexample}
-\begin{pspicture}[showgrid=true](5,3)
- \psbcurve[showpoints=true](1,1)(2,2)(3,1)(4,2)
+\begin{pspicture}[showgrid](0,-0.4)(5,3)
+ \psbcurve[showpoints](1,1)(2,2)(3,1)(4,2)
\uput[-90](1,1){$\vec{p}_{0}=\vec{l}_{1}$}
\uput[90](1.5,2){$\vec{r}_{1}$}
\uput[90](2,2){$\vec{p}_{1}$}
@@ -181,8 +195,8 @@
\begin{LTXexample}
-\pspicture[showgrid=true](5,3)
-\psset{showpoints=true}
+\pspicture[showgrid](0,-0.4)(5,3)
+\psset{showpoints}
\psbcurve[linecolor=blue,linewidth=0.01](1,1)%
(2,2)(3,1)(4,2)
\psbcurve(1,1)l(2,1)(2,2)(3,1)r(4,1)(4,2)
@@ -192,8 +206,8 @@
\end{LTXexample}
\begin{LTXexample}
-\pspicture[showgrid=true](5,3)
-\psset{showpoints=true}
+\pspicture[showgrid](0,-0.4)(5,3)
+\psset{showpoints}
\psbcurve[linecolor=blue,linewidth=0.01](1,1)%
(2,2)(3,1)(4,2)
\psbcurve(1,1)(2,2)l(2,1)(3,1)(4,2)
@@ -208,7 +222,7 @@
\begin{LTXexample}
-\pspicture(5,3)
+\pspicture(0,-0.4)(5,3)
\psbcurve(1,1)(2,2)l(2,1)(3,1)(4,2)
\endpspicture
\end{LTXexample}
@@ -220,10 +234,10 @@
demonstrated in the next example.
\begin{LTXexample}
-\pspicture[showgrid=true](5,3)
+\pspicture[showgrid](0,-0.4)(5,3)
\psbcurve[linecolor=blue,linewidth=0.01](1,1)%
(2,2)(3,1)(4,2)
-\psset{showpoints=true}
+\psset{showpoints}
\psbcurve(1,1)(2,2)L(2,1)(3,1)(4,2)
\uput[-90](2,1){$\vec{l}_{2}$}
\uput[0](2,2){$\vec{p}_{1}$}
@@ -236,8 +250,8 @@
\begin{LTXexample}
-\pspicture[showgrid=true](5,3)
-\psset{showpoints=true}
+\pspicture[showgrid](0,-0.4)(5,3)
+\psset{showpoints}
\psbcurve[linecolor=blue,linewidth=0.01](1,1)%
(2,2)(3,1)(4,2)
\psbcurve(1,1)(2,2)t{0.5}(3,1)(4,2)
@@ -252,8 +266,8 @@
respectively, as demonstrated in the following two examples.
\begin{LTXexample}
-\pspicture[showgrid=true](5,3)
-\psset{showpoints=true}
+\pspicture[showgrid](0,-0.4)(5,3)
+\psset{showpoints}
\psbcurve[linecolor=blue,linewidth=0.01](1,1)%
(2,2)(3,1)(4,2)
\psbcurve(1,1)%
@@ -263,8 +277,8 @@
\begin{LTXexample}
-\pspicture[showgrid=true](5,3)
-\psset{showpoints=true}
+\pspicture[showgrid](0,-0.4)(5,3)
+\psset{showpoints}
\psbcurve[linecolor=blue,linewidth=0.01](1,1)%
(2,2)(3,1)(4,2)
\psbcurve(1,1)(2,2)tr{0.5}(3,1)(4,2)
@@ -278,8 +292,8 @@
a rather surprising effect.
\begin{LTXexample}
-\pspicture[showgrid=true](5,3)
-\psset{showpoints=true}
+\pspicture[showgrid](0,-0.4)(5,3)
+\psset{showpoints}
\psbcurve[linecolor=blue,linewidth=0.01](1,1)%
(2,2)(3,1)(4,2)
\psbcurve(1,1)(2,2)ts{-0.5}(3,1)(4,2)
@@ -291,8 +305,8 @@
\begin{LTXexample}
-\pspicture[showgrid=true](5,3)
-\psset{showpoints=true}
+\pspicture[showgrid](0,-0.4)(5,3)
+\psset{showpoints}
\psbcurve[linecolor=blue,linewidth=0.01](1,1)%
(2,2)(3,1)(4,2)
\psbcurve[bcurveTension=0.5](1,1)%
@@ -307,8 +321,8 @@
that purpose as shown in the following example.
\begin{LTXexample}
-\pspicture[showgrid=true](5,6)
-\psset{showpoints=true}
+\pspicture[showgrid](0,0.6)(5,6)
+\psset{showpoints}
\psbcurve[linecolor=blue,linewidth=0.01](1,1)%
(2,2)(3,1)(4,2)(4,4)(3,5)%
(2,4)(1,5)
@@ -324,7 +338,7 @@
more) are respected by \Lcs{psbcurve} as the following example shows.
\begin{LTXexample}
-\pspicture[showgrid=true](5,3)
+\pspicture[showgrid](0,-0.4)(5,3)
\psbcurve[linestyle=dashed,
linewidth=3pt,
dash=0.5 0.2,
@@ -333,7 +347,7 @@
\endpspicture
\end{LTXexample}
-\section{Things that do not work (`known bugs')}
+\subsection{Things that do not work (`known bugs')}
As already mentioned this project is something like an experiment. So,
there are many things that do not work.
@@ -342,10 +356,375 @@
\item The control points are computed in a rather crude way (see
above). The \Lkeyword{curvature} option is not recognised.
\item If \Lkeyword{fillstyle} is set to \Lkeyword{solid} and
- \Lkeyset{showpoints=true} then the fill color covers the interpolation and control points.
+ \Lkeyword{showpoints} then the fill color covers the interpolation and control points.
\item arrow heads do not work.
\end{itemize}
+\clearpage
+
+\section{Bezier curve with weighted points}
+
+\subsection{Mathemathical background}
+
+A mass point is a weighted point $\left(P;\omega\right)$ with $\omega \neq 0$ or a vector $\left(\overrightarrow{P};0\right)$ with a weight equal to $0$. A generic mass point is noted $\left(P;\omega\right)$.
+
+Using the quadratic Bernstein polynomials, a rational quadratic B\'ezier curve having three control
+mass points $\left(P_{0};\omega_{0}\right)$, $\left(P_{1};\omega_{1}\right)$
+and $\left(P_{2};\omega_{2}\right)$, is defined as follow:
+
+\begin{definition}\label{fdef::DefRQBC_Fiorot}: Rational quadratic B\'ezier curve (BR curve)
+
+Let $\omega_{0}$, $\omega_{1}$ and $\omega_{2}$ be three real numbers.
+Let $\left(P_{0};\omega_{0}\right)$, $\left(P_{1};\omega_{1}\right)$
+and $\left(P_{2};\omega_{2}\right)$ be three mass points, these points are not collinear.
+
+Define two sets $I = \left \{ i | \omega_i \neq 0 \right \}$ and
+$J = \left \{ i | \omega_i = 0 \right \}$
+
+
+Define the function $\omega_{f}$ from $\left[0;1\right] $ to $\mathbb{R} $ as follows
+
+\begin{equation}
+%\begin{array}{cccc}
+%\omega_{f}: & \left[0;1\right] & \longrightarrow & \mathbb{R} \\
+%& t & \longmapsto &\omega_{f}\left(t\right)=\dy\sum_{i\in I}\omega_{i}\times B_{i}\left(t\right)
+%\end{array}
+\omega_{f}\left(t\right)=\dy\sum_{i\in I}\omega_{i}\times B_{i}\left(t\right)
+\label{eq:DenominateurCbreBezier}
+\end{equation}
+
+A mass point $\left(M;\omega\right)$ or $\left(\overrightarrow{u};0\right)$
+belongs to the quadratic B\'ezier curve defined by the three control
+mass points $\left(P_{0};\omega_{0}\right)$, $\left(P_{1};\omega_{1}\right)$
+and $\left(P_{2};\omega_{2}\right)$,
+if there is a real $t_{0}$ in $\left[0;1\right]$ such that:
+
+\begin{itemize}
+\item [$\bullet$] if $\omega_{f}\left(t_{0}\right)\neq0$ then we have
+
+\hspace*{-0.75cm}\begin{minipage}{1.0\textwidth}
+\begin{equation}
+\overrightarrow{OM} = \dy \frac{1}{\omega_{f}\left(t_{0}\right)}\left(\dy \sum_{i\in I} \dy \omega_{i} B_{i}\left(t_{0}\right)
+ \overrightarrow{OP_{i}} \right)
++\vspace{0.2cm}\dy \frac{1}{\omega_{f}\left(t_{0}\right)}\left( \sum_{i\in J} B_{i}\left(t_{0}\right) \overrightarrow{P_{i}}\right)
+\label{eq:DefRQBC_FiorotPoint}
+\end{equation}
+\end{minipage}
+
+\item [$\bullet$] if $\omega_{f}\left(t_{0}\right)=0$ then we have
+\begin{equation}
+\overrightarrow{u}=\sum_{i\in I}\omega_{i}B_{i}\left(t_{0}\right)\overrightarrow{OP_{i}}+\sum_{i\in J}B_{i}\left(t_{0}\right)\overrightarrow{P_{i}}\label{eq:DefRQBC_FiorotVecteur}
+\end{equation}
+
+\end{itemize}
+\hrulefill{}\end{definition}
+
+The reduced discriminant of the denominator $\omega_{f}\left(t_{0}\right)$ is
+\begin{equation}
+\Delta'=\omega_{1}^{2}-\omega_{2} \omega_{0}\label{eq:DiscrimantReduitCBRQnonStandard}
+\end{equation}
+and we can state the following fundamental result:
+\begin{itemize}
+\item[$\star$]
+if $\omega_{1}^{2}-\omega_{2} \omega_{0}=0$ then the
+ denominator has one and only one root, the curve is a parabolic arc;
+\item[$\star$]
+ if $\omega_{1}^{2}-\omega_{2} \omega_{0}>0$ then the
+ denominator has two distinct roots, the curve is a hyperbolic arc;
+\item[$\star$]
+ if $\omega_{1}^{2}-\omega_{2} \omega_{0}<0$ then the
+ denominator does not vanish, the curve is an elliptical arc.
+\end{itemize}
+
+We can note w.l.o.g.\footnote{We can permute the role of $P_0$ and $P_2$} that one of the weights can be equal to~$1$. If $\omega_0$ is not equal to $0$, we choose $\omega_0=1$, else, we choose $\omega_1=1$, and we can characterise the type of the conic from the mass points of the BR curve, see Table~\ref{tab::TypeConicEtcbeBr}.
+
+\begin{table}[!h]
+\begin{center}
+\begin{tabular}{|c||c|c|c|}\hline
+Conic & Three weighted points & Points and vectors \\ \hline \hline
+Parabola & $\left(P_{0};1\right)$, $\left(P_{1};\omega\right)$
+ $\left(P_{2};\omega^{2}\right)$ & $\left(P_{0};1\right)$, $\left(\overrightarrow{P_{1}};0\right)^{\mathstrut^{\mathstrut}}_{\mathstrut_{\mathstrut}}$ $\left(\overrightarrow{P_{2}};0\right)$\\ \hline \hline
+ Ellipse & $\left(P_{0};1\right)$, $\left(P_{1};\omega_{1}\right)$, $\left(P_{2};\omega_{2}\right)$, $ \omega_{2}>\omega_{1}^{2} $ & $\left(P_{0};1\right)$, $\left(\overrightarrow{P_{1}};0\right)^{\mathstrut^{\mathstrut}}_{\mathstrut_{\mathstrut}}$ $\left(P_{2};1\right)$ \\ \hline \hline
+ Hyperbola & $\left(P_{0};1\right)$, $\left(P_{1};\omega_{1}\right)$ $\left(P_{2};\omega_{2}\right)$, $\omega_{2}<\omega_{1}^{2}$ & $\left(P_{0};1\right)$, $\left(\overrightarrow{P_{1}};0\right)^{\mathstrut^{\mathstrut}}_{\mathstrut_{\mathstrut}}$ $\left(P_{2};-1\right)$ \\ \cline{3-3}
+& & $\left(\overrightarrow{P_{0}};0\right)$, $\left(P_{1};1\right)$ and $\left(\overrightarrow{P_{2}};0\right)^{\mathstrut^{\mathstrut}}_{\mathstrut_{\mathstrut}}$ \\ \hline \hline
+\end{tabular}
+\end{center}
+\caption{Types of conics defined by B\'ezier curves with control mass points.
+\hrulefill{}
+\label{tab::TypeConicEtcbeBr}}
+\end{table}
+
+From the access rights used by Unix and Linux, we define a bijection $f$ between $\mathbb{F_2}^3-\left\lbrace\left(0,0,0\right)\right\rbrace$ and the set $\left\lbrace 1 ,2 , 3, 4, 5, 6, 7\right\rbrace$. From $\left(\omega_2,\omega_1,\omega_0\right)$, we define a triplet $\left(b_2,b_1,b_0\right)$ as follow: if $w_i\neq0$ then $b_i=1$ else $b_i=0$. Then
+$$f\left(\omega_2,\omega_1,\omega_0\right)= b_2 \times 4+ b_1 \times 2+b_0$$
+
+If $f\left(\omega_2,\omega_1,\omega_0\right)=7$, the control points are weighted points: the curve is an elliptical arc, a parabolic arc or a hyperbolic arc. If $\left(\omega_2,\omega_1,\omega_0\right)=\left(1,-1,1\right)$, the parabolic arc is not bounded and for $t=\frac{1}{2}$, the mass point is a direction vector of the parabola axis. If $\left(\omega_2,\omega_1,\omega_0\right)=\left(1,-2,1\right)$, the hyperbolic arc is not bounded and there exists $t$ in $\left]0,1\right[$ such as the mass point is a direction vector of one of the asymptotes of the hyperbola. \\
+If $f\left(\omega_2,\omega_1,\omega_0\right)=1$, the first control point is a weighted point, the others are vectors: the curve is a parabolic arc. The B\'ezier curve is defined by
+ \begin{equation}
+\begin{cases}
+ \dy \frac{1}{\omega_0\, B_0\left(t_{0}\right)}\left( \omega_{0}\, B_{0}\left(t_{0}\right)
+ \overrightarrow{OP_{0}} + B_{1}\left(t_{0}\right) \overrightarrow{P_{1}}+ B_{2}\left(t_{0}\right)
+ \overrightarrow{P_{2}}\right) & \text{ if }t_0\in\left[0,1\right[ \\[1ex]
+\overrightarrow{P_2} & \text{ if }t_0=1\\
+ \end{cases}
+\label{eq:parabola}
+\end{equation}
+If $f\left(\omega_2,\omega_1,\omega_0\right)=4$, the B\'ezier curve can be defined in the same way.\\
+If $f\left(\omega_2,\omega_1,\omega_0\right)=2$, the intermediate control point is a weighted point, the others are vectors: the curve is a branch of a hyperbola. The B\'ezier curve is defined by
+ \begin{equation}
+\begin{cases}
+ \dy \frac{1}{\omega_1\, B_1\left(t_{0}\right)}\left( \omega_{1}\, B_{1}\left(t_{0}\right) \overrightarrow{OP_{1}}+ B_{0}\left(t_{0}\right) \overrightarrow{P_{0}}+ B_{2}\left(t_{0}\right) \overrightarrow{P_{2}}\right) & \text{ if }t_0\in\left]0,1\right[
+\\[1ex]
+\overrightarrow{P_0} & \text{ if }t_0=0\\[1ex]
+\overrightarrow{P_2} & \text{ if }t_0=1
+ \end{cases}
+\label{eq:branchHyperbola}
+\end{equation}
+and the centre of the hyperbola is $P_1$. The vector $\overrightarrow{P_0}$ is a direction vector of an asymptote of the hyperbola whereas the vector $\overrightarrow{P_2}$ is a direction vector of the other asymptote.\\
+If $f\left(\omega_2,\omega_1,\omega_0\right)=5$, the intermediate control point is a vector, the others are weighted points: the curve is an elliptical arc. The B\'ezier curve is defined by
+ \begin{equation}
+ \dy \frac{1}{\omega_0\, B_0\left(t_{0}\right)+\omega_2\, B_2\left(t_{0}\right)}\left( \omega_{0}\, B_{0}\left(t_{0}\right) \overrightarrow{OP_{0}} + B_{1}\left(t_{0}\right) \overrightarrow{P_{1}}+ \omega_2\, B_{2}\left(t_{0}\right) \overrightarrow{OP_{2}}\right),\;\; t_0\in\left[0,1\right]
+\label{eq:ellipse}
+\end{equation}
+and the tangent vector to the curve at $P_0$ or $P_2$ is parallel to $\overrightarrow{P_1}$.
+
+\subsection{Syntax}
+
+\begin{BDef}
+\Lcs{psRQBCmasse}\OptArgs\Largr{$x_0,y_0$}\Largr{$x_1,y_1$}\Largr{$x_2,y_2$}\Largb{$w_0,w_1,w_2$}
+\end{BDef}
+
+For the coordinates of the points all possible kinds of coordinates are possible, like polar, PostScript, nodes, \ldots
+
+\subsection{Three weighted orthogonal points}
+\begin{LTXexample}[pos=t]
+\begin{pspicture}[showgrid](-6,-6.4)(3,3)
+\psclip{\psframe(-6,-6)(3,3)}
+ \psRQBCmasse[linecolor=blue](2,0)(2,2)(0,2){1,-1,1}
+ \psRQBCmasse[linecolor=navy,autoTrace](2,0)(2,2)(0,2){1,1,1}
+ \rput(P0){$P_0$}\uput[r](P1){$P_1$}\uput[r](P2){$P_2$}
+\endpsclip%
+\end{pspicture}
+\end{LTXexample}
+
+
+
+\subsection{Half-ellipse}
+\begin{LTXexample}[pos=t]
+\begin{pspicture}[showgrid](-3,-2.4)(3,2)
+\psframe(-3,-2)(3,2)
+\psRQBCmasse[linecolor=red,autoTrace](2,0)(0,1)(-2,0){1,0,1}
+\uput[r](P0P1){$\overrightarrow{P_1}$} \uput[r](P2){$P_2$}
+\rput(P1P2){$\overrightarrow{P_{1}}$} \uput[r](P0){$P_0$}
+\psRQBCmasse[linecolor=orange,autoTrace=false](2,0)(0,-1)(-2,0){1,0,1}
+\end{pspicture}
+\end{LTXexample}
+
+
+\clearpage
+
+\subsection{Half-parabola}
+\subsubsection{Point $P_2$ and two vectors}
+
+\begin{LTXexample}[pos=t]
+\begin{pspicture}[showgrid](-3,-3.4)(3,3)
+\psclip{\psframe(-3,-3)(3,3)}
+ \psRQBCmasse[linecolor=red,autoTrace](2,0)(0,1)(-1,0){0,0,1}
+ \uput[r](P1P2){$\overrightarrow{P_1}$} \uput[r](P2){$P_2$}
+ \uput[r](P0P2){$\overrightarrow{P_0}$}
+ \psRQBCmasse[linecolor=orange,autoTrace=false](2,0)(0,-1)(-1,0){0,0,1}
+ \uput[r](P1P2){$\overrightarrow{P_1}$} \uput[r](P2){$P_2$}
+ \uput[r](P0P2){$\overrightarrow{P_0}$}
+\endpsclip
+\end{pspicture}
+\end{LTXexample}
+
+\subsubsection{Point $P_0$ and two vectors}
+
+\begin{LTXexample}[pos=t]
+\begin{pspicture}[showgrid](-3,-3.4)(3,3)
+\psclip{\psframe(-3,-3)(3,3)}
+ \psRQBCmasse[linecolor=red,autoTrace](2,0)(0,1)(-1,0){1,0,0}
+ \uput[r](P0P1){$\overrightarrow{P_1}$} \uput[r](P0){$P_0$}
+ \uput[r](P0P2){$\overrightarrow{P_2}$}
+ \psRQBCmasse[linecolor=orange,autoTrace=false](2,0)(0,-1)(-1,0){1,0,0}
+\endpsclip%
+\end{pspicture}
+\end{LTXexample}
+
+\clearpage
+
+\subsection{Branch of a hyperbola}
+\begin{LTXexample}[pos=t]
+\begin{pspicture}[showgrid](-3,-3.4)(3,3)
+\psclip{\psframe(-3,-3)(3,3)}
+ \psRQBCmasse[linecolor=red,autoTrace](1,1)(0,0)(-1,1){0,1,0}
+ \uput[r](P0){$\overrightarrow{P_0}$} \uput[r](0,-0.5){$P_1$}
+ \uput[r](P2){$\overrightarrow{P_2}$}
+ \psRQBCmasse[linecolor=orange,autoTrace=false](1,1)(0,0)(-1,1){0,-1,0}
+\endpsclip%
+\end{pspicture}
+\end{LTXexample}
+
+\subsection{Parabola}
+\begin{LTXexample}[pos=t]
+\psset{unit=0.5}
+\begin{pspicture}(-14,-3.4)(15,10)
+\psclip{\psframe(-14,-3)(15,10)}
+ \psRQBCmasse[linecolor=red,autoTrace](0,6)(-13,0)(-1,-1){1,1,1}
+ \psRQBCmasse[linecolor=orange](0,6)(-13,0)(-1,-1){1,-1,1}
+ \uput[u](P0){$P_0$}\uput[l](P1){$P_1$}\uput[d](P2){$P_2$}
+\endpsclip
+\end{pspicture}
+\end{LTXexample}
+
+
+\clearpage
+
+\subsection{Ellipse}
+\begin{LTXexample}[pos=t]
+\psset{unit=0.5}
+\begin{pspicture}(-14,-3.4)(15,10)
+\psgrid[subgriddiv=0,gridcolor=lightgray,griddots=5,gridlabels=0pt]
+%\psplotImp[linewidth=0.5pt,linecolor=blue,algebraic](-6,-3)(15,10)%
+ %{ -0.044*x^2-0.161*y^2 + 0.075*x*y + 0.074*x + 0.797*y + 1}
+\psRQBCmasse[nPoints=20,autoTrace,showpoints](0,6)(-13,0)(-1,-1){1,0.5,1}
+\psRQBCmasse[nPoints=40,linecolor=red,showpoints](0,6)(-13,0)(-1,-1){1,-0.5,1}
+\psaxes[labelFontSize=\scriptscriptstyle]{->}(0,0)(-14,-3)(15,10)
+\end{pspicture}
+\end{LTXexample}
+
+
+\subsection{Complete circle}
+\begin{LTXexample}[pos=t]
+\psset{unit=1}
+\begin{pspicture}(-4,-4.4)(4,4)
+\psgrid[subgriddiv=0,gridcolor=lightgray,griddots=5,gridlabels=0pt]
+\psRQBCmasse[autoTrace](0,3)(3,3)(3,0){1,1,2}
+\psRQBCmasse[linecolor=red](0,3)(3,3)(3,0){1,-1,2}
+\psaxes[labelFontSize=\scriptscriptstyle]{->}(0,0)(-4,-4)(4,4)
+\end{pspicture}
+\end{LTXexample}
+
+
+\begin{LTXexample}[pos=t]
+\psset{unit=1.5}
+\begin{pspicture}(-4,-4.4)(4,4)
+\psgrid[subgriddiv=0,gridcolor=lightgray,griddots=5,gridlabels=0pt]
+\psRQBCmasse[autoTrace](0,3)(3,0)(0,-3){1,0,1}
+\uput[u](-0.25,3){$P_0$}
+\uput[u](-0.25,-3.5){$P_2$}
+\uput[u](3,3){$\overrightarrow{P_1}$}
+\uput[u](3,-3.5){$\overrightarrow{P_1}$}
+\uput[u](2.5,0){$\overrightarrow{P_1}$}
+\psRQBCmasse[linecolor=red](0,3)(-3,0)(0,-3){1,0,1}
+\psaxes[labelFontSize=\scriptscriptstyle,linewidth=0.01]{->}(0,0)(-4,-4)(4,4)
+\end{pspicture}
+\end{LTXexample}
+We get a circle because we have
+
+\begin{equation}
+\left\lbrace
+\begin{array}{rcl}
+\omega_0\times\omega_2\times P_0 P_2^2 &= &4\times\overrightarrow{P_1}^2 \\[0.2cm]
+\overrightarrow{P_0 P_2} &\perp & \overrightarrow{P_1}
+\end{array}
+\right.
+\end{equation}
+
+\clearpage
+
+
+\subsection{Animations}
+
+\subsubsection{$w_0=1$, $w_2=1$ and a variable $w_1$}
+
+With the beginning of $w_1=0$
+the curves are swapped. In the case of Bezier curves $w_1 = 0$ gives only
+the $[P_0 P_2]$ segment. Using the mass points, the point $P_1$ no longer exists but we get the vector $\overrightarrow{P_1}$.
+
+
+\bigskip
+\begin{center}
+\begin{animateinline}[controls,loop,palindrome,
+ begin={\begin{pspicture}(-4,-4)(10,4)},
+ end={\end{pspicture}}]{3}% 3 images/s
+\multiframe{40}{rA=2.0+-0.1,rB=-2.0+0.1}{%
+ \psgrid[subgriddiv=0,gridcolor=lightgray,griddots=5,gridlabels=0pt]
+ \psclip{\psframe(-4,-4)(10,4)}
+ \psRQBCmasse[autoTrace,linewidth=1.5pt](0,-1)(1,0)(0,1){1,\rA,1}
+ \uput[u](P2){$P_2$}\uput[l](P1){$P_1$}\uput[d](P0){$P_0$}
+ \psRQBCmasse[linecolor=red,linewidth=1.5pt](0,-1)(1,0)(0,1){1,\rB,1}
+ \psaxes[labelFontSize=\scriptscriptstyle,linewidth=0.01]{->}(0,0)(-4,-4)(10,4)
+ \rput(8,3){$w_1=\rA$}%
+ \endpsclip
+}
+\end{animateinline}
+\end{center}
+
+\begin{lstlisting}
+\begin{animateinline}[controls,loop,palindrome,
+ begin={\begin{pspicture}(-4,-4)(10,4)},
+ end={\end{pspicture}}]{3}% 3 images/s
+\multiframe{40}{rA=2.0+-0.1,rB=-2.0+0.1}{%
+ \psgrid[subgriddiv=0,gridcolor=lightgray,griddots=5,gridlabels=0pt]
+ \psclip{\psframe(-4,-4)(10,4)}
+ \psRQBCmasse[autoTrace,linewidth=1.5pt](0,-1)(1,0)(0,1){1,\rA,1}
+ \uput[u](P2){$P_2$}\uput[l](P1){$P_1$}\uput[d](P0){$P_0$}
+ \psRQBCmasse[linecolor=red,linewidth=1.5pt](0,-1)(1,0)(0,1){1,\rB,1}
+ \psaxes[labelFontSize=\scriptscriptstyle,linewidth=0.01]{->}(0,0)(-4,-4)(10,4)
+ \rput(8,3){$w_1=\rA$}%
+ \endpsclip
+}
+\end{animateinline}
+\end{lstlisting}
+
+
+
+\clearpage
+
+\subsubsection{$w_0=1$, $\left |w_1\right|=1$ and a variable $w_2$}
+
+%L'utilisation de $\left |w_1\right|$ permet d'obtenir les deux arcs et donc toute la conique.
+The use of $\left |w_1\right|$ provides both arcs and the whole cone.
+
+\bigskip
+\begin{center}
+\begin{animateinline}[controls,loop,palindrome,
+ begin={\begin{pspicture}(-8,-4)(4,4)},
+ end={\end{pspicture}}]{3}% 3 images/s
+\multiframe{80}{rA=4.0+-0.1}{%
+ \psgrid[subgriddiv=0,gridcolor=lightgray,griddots=5,gridlabels=0pt]
+ \psclip{\psframe(-8,-4)(4,4)}
+ \psRQBCmasse[autoTrace,linewidth=1.5pt](0,-1)(1,0)(0,1){1,1,\rA}
+ \uput[u](P2){$P_2$}\uput[l](P1){$P_1$}\uput[d](P0){$P_0$}
+ \psRQBCmasse[linecolor=red,linewidth=1.5pt](0,-1)(1,0)(0,1){1,-1,\rA}
+ \psaxes[labelFontSize=\scriptscriptstyle,linewidth=0.01]{->}(0,0)(-8,-4)(4,4)
+ \rput[rb](3.5,3){$w_2=\rA$}%
+ \endpsclip
+}
+\end{animateinline}
+\end{center}
+
+\begin{lstlisting}
+\begin{animateinline}[controls,loop,palindrome,
+ begin={\begin{pspicture}(-8,-4)(4,4)},
+ end={\end{pspicture}}]{3}% 3 images/s
+\multiframe{80}{rA=4.0+-0.1}{%
+ \psgrid[subgriddiv=0,gridcolor=lightgray,griddots=5,gridlabels=0pt]
+ \psclip{\psframe(-8,-4)(4,4)}
+ \psRQBCmasse[autoTrace,linewidth=1.5pt](0,-1)(1,0)(0,1){1,1,\rA}
+ \uput[u](P2){$P_2$}\uput[l](P1){$P_1$}\uput[d](P0){$P_0$}
+ \psRQBCmasse[linecolor=red,linewidth=1.5pt](0,-1)(1,0)(0,1){1,-1,\rA}
+ \psaxes[labelFontSize=\scriptscriptstyle,linewidth=0.01]{->}(0,0)(-8,-4)(4,4)
+ \rput[rb](3.5,3){$w_2=\rA$}%
+ \endpsclip
+}
+\end{animateinline}
+\end{lstlisting}
+
+
+\clearpage
+
\section{List of all optional arguments for \texttt{pst-bezier}}
@@ -355,11 +734,13 @@
\bgroup
\raggedright
\nocite{*}
-\bibliographystyle{plain}
-\bibliography{pst-bezier-doc}
+\printbibliography
\egroup
\printindex
\end{document}
+
+
+Moreover, we can choose a non Euclidean metric. The use of mass points, Bézier curves, conics and the space of spheres in the Minkowski-Lorentz space permits to realise G1-continous blend between Dupin cyclides : to blend surfaces in R3, we blend Bézier curves in R5. For example, we can build a seahorse (see 09_LorentzHippocampeComplet.png), the article (in French) is here:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-bezier.doc.tlpobj new/tlpkg/tlpobj/pst-bezier.doc.tlpobj
--- old/tlpkg/tlpobj/pst-bezier.doc.tlpobj 2016-04-14 19:36:37.000000000 +0200
+++ new/tlpkg/tlpobj/pst-bezier.doc.tlpobj 2017-04-14 17:55:02.000000000 +0200
@@ -1,11 +1,11 @@
name pst-bezier.doc
category Package
-revision 15878
+revision 41981
shortdesc doc files of pst-bezier
relocated 1
-docfiles size=32
+docfiles size=296
RELOC/doc/generic/pst-bezier/Changes
- RELOC/doc/generic/pst-bezier/README
+ RELOC/doc/generic/pst-bezier/README.md
RELOC/doc/generic/pst-bezier/pst-bezier-doc.bib
RELOC/doc/generic/pst-bezier/pst-bezier-doc.pdf
RELOC/doc/generic/pst-bezier/pst-bezier-doc.tex
++++++ pst-bezier.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dvips/pst-bezier/pst-bezier.pro new/dvips/pst-bezier/pst-bezier.pro
--- old/dvips/pst-bezier/pst-bezier.pro 2009-01-30 01:07:44.000000000 +0100
+++ new/dvips/pst-bezier/pst-bezier.pro 2016-11-25 19:30:57.000000000 +0100
@@ -1,17 +1,16 @@
-%% $Id: pst-bezier.pro 87 2009-01-29 10:37:06Z herbert $
-%% PostScript prologue for pstricks-add.tex.
+%% $Id: pst-bezier.pro 323 2016-08-20 17:57:28Z herbert $
+%% PostScript prologue for pst-bezier.tex.
%%
-%% Version 0.01, 2009/01/29
+%% Version 0.02, 2016/08/19
%%
%% For distribution, see pst-bezier.tex.
%%
%%
tx@Dict begin
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% Auxiliary routines:
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
+%
%% [x1 y1] [x2 y2] -> [ x1+y1 x2+y2 ]
/AddArrays2d {
[ 3 1 roll %% Get the operands
@@ -40,8 +39,7 @@
3 1 roll
1 get mul
] } bind def
-
-
+%
%% << [Array of Bezier splines] /K 1 >> -> empty stack
%% Thereby, a Bezier spline is described by an array:
%% [x0 y0 x1 y1 x2 y2 x3 y3 sl sr]
@@ -71,7 +69,6 @@
Splines K 1 sub get 2 2 getinterval SubArrays2d
putinterval %%
} if
-
%% Second control point:
Splines K get 2 get dup %% (cases /n and /s)
/n eq { %% `not specified' -> automatically computed
@@ -106,4 +103,134 @@
]
end def %% Put points in the top dictionary
} bind def
+%
+/tx@RQBCmasse {
+ /P0P1{
+ xP0 xP1 add
+ yP0 yP1 add
+ } def
+ /P0P2{
+ xP0 xP2 add
+ yP0 yP2 add
+ } def
+ /P1P2{
+ xP2 xP1 add
+ yP2 yP1 add
+ } def
+ /B0 { 1 t sub dup mul } def
+ /B1 {2 t mul 1 t sub mul }def
+ /B2 { t dup mul }def
+%
+% w0 abs 1e-6 gt {1}{0} ifelse /choixw0 exch def
+% w1 abs 1e-6 gt {1}{0} ifelse /choixw1 exch def
+% w2 abs 1e-6 gt {1}{0} ifelse /choixw2 exch def
+% /choix choixw2 4 mul choixw1 2 mul add choixw0 add def
+ choix 1 eq {
+ /den { w0 B0 mul }def %
+ /RQBCmasse1 {
+ 0 1 nB {/t exch nB div def
+ den 0 ne {
+ w0 B0 mul xP0 mul B1 xP1 mul add B2 xP2 mul add den div
+ w0 B0 mul yP0 mul B1 yP1 mul add B2 yP2 mul add den div
+ } if
+ } for
+ } def
+ /RQBCmasse2 {} def
+ } if % fin choix 1
+ choix 2 eq {
+ /den {w1 B1 mul } def %
+ /RQBCmasse1 {
+ 1 1 nB {/t exch nB div def
+ den 0 ne {% B0*P0+w1*B1*P1+B2*P2
+ B0 xP0 mul w1 B1 mul xP1 mul add B2 xP2 mul add den div
+ B0 yP0 mul w1 B1 mul yP1 mul add B2 yP2 mul add den div
+ } if
+ } for
+ } def
+ /RQBCmasse2 {} def
+ } if % fin choix 2
+ choix 3 eq {
+ /den { w0 B0 mul w1 B1 mul add } def % w0*B0+w1*B1
+ /RQBCmasse1 {
+ 0 1 nB {/t exch nB div def
+ den 1e-6 gt { % w0*B0*P0+w1*B1*P1+B2*P2
+ w0 B0 mul xP0 mul w1 B1 mul xP1 mul add B2 xP2 mul add den div
+ w0 B0 mul yP0 mul w1 B1 mul yP1 mul add B2 yP2 mul add den div
+ } if
+ } for
+ } def
+ /RQBCmasse2 {
+ 0 1 nB {/t exch nB div def
+ den -1e-6 lt { % w0*B0*P0+w1*B1*P1+B2*P2
+ w0 B0 mul xP0 mul w1 B1 mul xP1 mul add B2 xP2 mul add den div
+ w0 B0 mul yP0 mul w1 B1 mul yP1 mul add B2 yP2 mul add den div
+ } if
+ } for
+ } def
+ } if % fin choix 3
+ choix 4 eq {
+ /den { w2 B2 mul } def % w2*B2
+ /RQBCmasse1 {
+ 0 1 nB {/t exch nB div def
+ den 0 ne { % B0*P0+B1*P1+w2*B2*P2
+ B0 xP0 mul B1 xP1 mul add w2 B2 mul xP2 mul add den div
+ B0 yP0 mul B1 yP1 mul add w2 B2 mul yP2 mul add den div
+ } if
+ } for
+ } def
+ /RQBCmasse2 {} def
+ } if % fin choix 4
+ choix 5 eq {
+ /den {w0 B0 mul w2 B2 mul add} def % w0*B0+w2*B2
+ /RQBCmasse1 {
+ 1 1 nB {/t exch nB div def
+ den 0 ne { % w0*B0*P0+B1*P1+w2*B2*P2
+ w0 B0 mul xP0 mul B1 xP1 mul add w2 B2 mul xP2 mul add den div
+ w0 B0 mul yP0 mul B1 yP1 mul add w2 B2 mul yP2 mul add den div
+ } if
+ } for
+ } def
+ /RQBCmasse2 {} def
+ } if % fin choix 5
+ choix 6 eq {
+ /den { w1 B1 mul w2 B2 mul add } def % w1*B1+w2*B2
+ /RQBCmasse1 {
+ 0 1 nB {/t exch nB div def
+ den 1e-6 gt { % B0*P0+w1*B1*P1+w2*B2*P2
+ B0 xP0 mul w1 B1 mul xP1 mul add w2 B2 mul xP2 mul add den div
+ B0 yP0 mul w1 B1 mul yP1 mul add w2 B2 mul yP2 mul add den div
+ } if
+ } for
+ } def
+ /RQBCmasse2 {
+ 0 1 nB {/t exch nB div def
+ den -1e-6 lt { % B0*P0+w1*B1*P1+w2*B2*P2
+ B0 xP0 mul w1 B1 mul xP1 mul add w2 B2 mul xP2 mul add den div
+ B0 yP0 mul w1 B1 mul yP1 mul add w2 B2 mul yP2 mul add den div
+ } if
+ } for
+ } def
+ } if % fin choix 6
+ choix 7 eq {
+ /den { w0 B0 mul w1 B1 mul add w2 B2 mul add } def
+% tableau de pointslist[(w0-w1+sqrt(-w0*w2+w1^2))/(w0-2*w1+w2),(w0-w1-sqrt(-w0*w2+w1^2))/(w0-2*w1+w2)]
+ /RQBCmasse1 {
+ 0 1 nB {/t exch nB div def
+ den 1e-6 gt { % w0*B0*P0+w1*B1*P1+w2*B2*P2
+ w0 B0 mul xP0 mul B1 w1 mul xP1 mul add w2 B2 mul xP2 mul add den div % xP
+ w0 B0 mul yP0 mul B1 w1 mul yP1 mul add w2 B2 mul yP2 mul add den div % yP
+ } if
+ } for
+ } def
+ /RQBCmasse2 {
+ 0 1 nB {/t exch nB div def
+ den -1e-6 lt {
+ w0 B0 mul xP0 mul B1 w1 mul xP1 mul add w2 B2 mul xP2 mul add den div % xP
+ w0 B0 mul yP0 mul B1 w1 mul yP1 mul add w2 B2 mul yP2 mul add den div % yP
+ } if
+ } for
+ } def
+ } if % fin du choix 7
+} def
+%
end %% tx@Dict
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/pst-bezier/pst-bezier.tex new/tex/generic/pst-bezier/pst-bezier.tex
--- old/tex/generic/pst-bezier/pst-bezier.tex 2009-01-30 01:07:44.000000000 +0100
+++ new/tex/generic/pst-bezier/pst-bezier.tex 2016-11-25 19:33:37.000000000 +0100
@@ -6,8 +6,8 @@
%%
%% Package `pst-bezier.tex'
%%
-%% Tobias Nähring (www.tn-home.de)
-%% Herbert Voss
+%% Tobias Nähring (www.tn-home.de) (inactive)
+%% Herbert Voss
%%
%% This program can be redistributed and/or modified under the terms
%% of the LaTeX Project Public License Distributed from CTAN archives
@@ -20,18 +20,20 @@
\csname PSTbezierLoaded\endcsname
\let\PSTbezierLoaded\endinput
-\def\fileversion{0.01}
-\def\filedate{2009/01/29}
-\message{ v\fileversion, \filedate}
-
\ifx\PSTricksLoaded\endinput\else\input pstricks.tex\fi
-\ifx\PSTXKeyLoaded\endinput\else\input pst-xkey \fi
+\ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi
+\ifx\PSTplotLoaded\endinput\else \input pst-plot \fi
+\ifx\PSTnodesLoaded\endinput\else\input pst-node \fi
+
+\def\fileversion{0.03}
+\def\filedate{2016/09/03}
+\message{ v\fileversion, \filedate}
\edef\TheAtCode{\the\catcode`\@}\catcode`\@=11
\pst@addfams{pst-bezier}
-%% We need this:
+%% We need this if we do not have LaTeX:
\expandafter\if\csname gobble\endcsname\relax\def\gobble#1{}\fi
%%
%% \newcommand is not native TeX. Therefore the following definition.
@@ -187,7 +189,7 @@
%% The following macro declare the pstricks option psbcurveTension
%% and set it to its default value.
\define@key[psset]{pst-bezier}{bcurveTension}[0.25]{\def\psk@bcurveTension{#1}}
-\psset{bcurveTension=0.25}
+\psset[pst-bezier]{bcurveTension=0.25}
%% Points of a spline that are not set yet
%% to a certain value or action
@@ -198,8 +200,8 @@
\def\psbcurve@pointSetDefaults{%
\psbcurve@defIfVoid{l}{\psbcurve@ptNotDef}%
\psbcurve@defIfVoid{r}{\psbcurve@ptNotDef}%
- \psbcurve@defIfVoid{sl}{\code{ \psk@bcurveTension\space}}%
- \psbcurve@defIfVoid{sr}{\code{ \psk@bcurveTension\space}}%
+ \psbcurve@defIfVoid{sl}{\code{ \psk@bcurveTension\space }}%
+ \psbcurve@defIfVoid{sr}{\code{ \psk@bcurveTension\space }}%
\psbcurve@defIfVoid{addon}{}%
}
@@ -236,34 +238,34 @@
\def\psbcurve@tension#1{\futurelet\psbcurve@tmp\psbcurve@@tension}
%%
\def\psbcurve@@tension{%
-\psbcurve@switch\psbcurve@tmp{%
- l,\psbcurve@ltension,%
- r,\psbcurve@rtension,%
- s,\psbcurve@stension,%
- \relax,\psbcurve@@@tension%
+ \psbcurve@switch\psbcurve@tmp{%
+ l,\psbcurve@ltension,%
+ r,\psbcurve@rtension,%
+ s,\psbcurve@stension,%
+ \relax,\psbcurve@@@tension
}}
%% the modifier t without further sub-modifiers
\def\psbcurve@@@tension#1{%
-\psbcurve@def{sr}{\code{ #1 }}%
-\psbcurve@def{sl}{\code{ #1 }}%
-\psbcurve@next}
+ \psbcurve@def{sr}{\code{ #1 }}%
+ \psbcurve@def{sl}{\code{ #1 }}%
+ \psbcurve@next}
%% the modifier ts
\def\psbcurve@stension#1#2{% symmetric
-\psbcurve@def[-1]{sr}{\code{ #2 }}%
-\psbcurve@def{sl}{\code{ #2 }}%
-\psbcurve@next}
+ \psbcurve@def[-1]{sr}{\code{ #2 }}%
+ \psbcurve@def{sl}{\code{ #2 }}%
+ \psbcurve@next}
%% the modifier tl
\def\psbcurve@ltension#1#2{% left control point
-\psbcurve@def{sl}{\code{ #2 }}%
-\psbcurve@next}
+ \psbcurve@def{sl}{\code{ #2 }}%
+ \psbcurve@next}
%% the modifier tr
\def\psbcurve@rtension#1#2{% right control point
-\psbcurve@def{sr}{\code{ #2 }}%
-\psbcurve@next}
+ \psbcurve@def{sr}{\code{ #2 }}%
+ \psbcurve@next}
%% This macro is called if the next token is
%% no modifier but a point (x,y)
@@ -321,15 +323,90 @@
\def\psbcurve@next{\futurelet\psbcurve@tmp\psbcurve@@next}
\def\psbcurve@@next{%
\psbcurve@switch\psbcurve@tmp{%
-(,\psbcurve@nextPoint,%)
-l,\psbcurve@lPoint,%
-r,\psbcurve@rPoint,%
-L,\psbcurve@LPoint,%
-t,\psbcurve@tension,%
-T,\psbcurve@Tension,%
-\relax,\psbcurve@end}%
+ (,\psbcurve@nextPoint,%)
+ l,\psbcurve@lPoint,%
+ r,\psbcurve@rPoint,%
+ L,\psbcurve@LPoint,%
+ t,\psbcurve@tension,%
+ T,\psbcurve@Tension,%
+ \relax,\psbcurve@end}%
}
-
+%
+\define@key[psset]{pst-bezier}{nPoints}{\def\psk@nPoints{#1 }}
+\define@boolkey[psset]{pst-bezier}[Pst@]{showPolygon}[true]{}
+\define@boolkey[psset]{pst-bezier}[Pst@]{autoTrace}[true]{}
+% valeurs par défaut
+% les coordonnées des points de contrôle P0= x0 y0, etc.
+%\psset[pst-RQBC]{P0=2 0,P1=2 2,P2=0 2,w=1 0.707 1,n=400,showPoints=true,showPolygon=false}
+\psset[pst-bezier]{nPoints=400,showPolygon=false,autoTrace=false}
+%
+\def\pst@get@w#1,#2,#3\@nil{%
+ \def\pst@@w{#1 #2 #3 }%
+ \def\psk@wZero{#1 }%
+ \def\psk@wUn{#2 }%
+ \def\psk@wDeux{#3 }}
+%
+\def\psRQBCmasse{\def\pst@par{}\pst@object{psRQBCmasse}}
+\def\psRQBCmasse@i(#1)(#2)(#3)#4{{%
+% \addbefore@par{showpoints=false}%
+ \begin@SpecialObj
+ \pst@get@w#4\@nil
+ \pst@getcoor{#1}\pst@tempA
+ \pst@getcoor{#2}\pst@tempB
+ \pst@getcoor{#3}\pst@tempC
+ \pst@cntm=\pscalculate{abs(\psk@wZero)<1e-6 ? 0 : 1}%
+ \pst@cntn=\pscalculate{abs(\psk@wUn)<1e-6 ? 0 : 2}%
+ \pst@cnto=\pscalculate{abs(\psk@wDeux)<1e-6 ? 0 : 4}%
+ \edef\ps@choix{\the\numexpr\pst@cntm+\pst@cntn+\pst@cnto}%
+% \typeout{>>pst-bezier: ps@choix=\ps@choix}%
+ \pstVerb{
+% \addto@pscode{
+ tx@Dict begin
+ /nB \psk@nPoints def
+ \pst@tempA \tx@UserCoor /yP0 exch def /xP0 exch def
+ \pst@tempB \tx@UserCoor /yP1 exch def /xP1 exch def
+ \pst@tempC \tx@UserCoor /yP2 exch def /xP2 exch def
+ \pst@@w /w2 exch def /w1 exch def /w0 exch def
+ /choix \ps@choix\space def
+ tx@RQBCmasse
+ end
+ } % fin pstVerb
+ \pnodes(#1){P0}(#2){P1}(#3){P2}
+ \pnode(!P0P1){P0P1}
+ %\pnode(!P1P0){P1P0}
+ \pnode(!P1P2){P1P2}
+ \pnode(!P0P2){P0P2}
+ \pslistplot{RQBCmasse1}\pslistplot[showpoints=false]{RQBCmasse2}%
+ \ifPst@autoTrace
+ \ifcase\ps@choix
+ \or %1
+ \psline[linestyle=dashed,linecolor=black,arrowinset=0.1,arrowsize=0.2]{->}(#1)(P0P1)
+ \psline[linestyle=dashed,linecolor=green,arrowinset=0.1,arrowsize=0.2]{->}(#1)(P0P2)
+ %\psline[linestyle=dashed,linecolor=magenta,arrowinset=0.1,arrowsize=0.2]{->}(P1)
+ \psdots(#1)%(P1)(P2)
+ \or %2
+ \psline[linestyle=dashed,linecolor=black,arrowinset=0.1,arrowsize=0.2]{->}(#2)(P0P1)
+ \psline[linestyle=dashed,linecolor=green,arrowinset=0.1,arrowsize=0.2]{->}(#2)(P1P2)
+ %\psline[linestyle=dashed,linecolor=magenta,arrowinset=0.1,arrowsize=0.2]{->}(P1)
+ \psdots(#2)%(P1)(P2)
+ \or %3
+ \or %4
+ \psline[linestyle=dashed,linecolor=black,arrowinset=0.1,arrowsize=0.2]{->}(#3)(P1P2)
+ \psline[linestyle=dashed,linecolor=green,arrowinset=0.1,arrowsize=0.2]{->}(#3)(P0P2)
+ %\psline[linestyle=dashed,linecolor=magenta,arrowinset=0.1,arrowsize=0.2]{->}(P1)
+ \psdots(#3)%(P1)(P2)
+ \or % 5
+ \psline[linestyle=dashed,linecolor=black,arrowinset=0.1,arrowsize=0.2]{->}(#1)(P0P1)
+ \psline[linestyle=dashed,linecolor=green,arrowinset=0.1,arrowsize=0.2]{->}(#3)(P1P2)
+ \psline[linestyle=dashed,linecolor=magenta,arrowinset=0.1,arrowsize=0.2]{->}(#2)
+ \psdots(#1)(#2)(#3)
+ \or %6
+ \or %7
+ \psline(#1)(#2)(#3)\psdots(#1)(#2)(#3)
+ \fi
+ \fi
+ \end@SpecialObj}\ignorespaces}
+%
\catcode`\@=\TheAtCode\relax
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pst-bezier/pst-bezier.sty new/tex/latex/pst-bezier/pst-bezier.sty
--- old/tex/latex/pst-bezier/pst-bezier.sty 2009-01-30 01:07:44.000000000 +0100
+++ new/tex/latex/pst-bezier/pst-bezier.sty 2016-11-25 19:33:57.000000000 +0100
@@ -1,13 +1,18 @@
-%% $Id: pst-bezier.sty 86 2009-01-29 10:34:00Z herbert $
+%% $Id: pst-bezier.sty 321 2016-08-20 07:45:01Z herbert $
%
\RequirePackage{pstricks}
-\ProvidesPackage{pst-bezier}[2009/01/29 v. 0.01 package wrapper for
+\RequirePackage{expl3}
+\ExplSyntaxOn
+ \cs_new_eq:NN \pscalculate \fp_eval:n
+\ExplSyntaxOff
+%
+\ProvidesPackage{pst-bezier}[2016/08/19 v. 0.02 package wrapper for
pst-bezier.tex (hv)]
\input{pst-bezier.tex}
\ProvidesFile{pst-bezier.tex}
[\filedate\space v\fileversion\space `PST-bezier' (tn,hv)]
\IfFileExists{pst-bezier.pro}{%
\ProvidesFile{pst-bezier.pro}
- [2009/01/29 v. 0.01, PostScript prologue file (tn,hv)]
+ [2016/08/19 v. 0.02, PostScript prologue file (tn,hv)]
\@addtofilelist{pst-bezier.pro}}{}%
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-bezier.tlpobj new/tlpkg/tlpobj/pst-bezier.tlpobj
--- old/tlpkg/tlpobj/pst-bezier.tlpobj 2016-04-14 19:36:37.000000000 +0200
+++ new/tlpkg/tlpobj/pst-bezier.tlpobj 2017-04-14 17:55:02.000000000 +0200
@@ -1,18 +1,18 @@
name pst-bezier
category Package
-revision 15878
+revision 41981
shortdesc Draw Bezier curves
relocated 1
longdesc The package provides a macro \psbcurve for drawing a Bezier
longdesc curve. Provision is made for full control of over all the
longdesc control points of the curve.
-runfiles size=5
+runfiles size=7
RELOC/dvips/pst-bezier/pst-bezier.pro
RELOC/tex/generic/pst-bezier/pst-bezier.tex
RELOC/tex/latex/pst-bezier/pst-bezier.sty
catalogue-also ebezier
catalogue-ctan /graphics/pstricks/contrib/pst-bezier
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-09-03 14:36:12 +0200
catalogue-license lppl
catalogue-topics graphics-curve pstricks
-catalogue-version 0.01
+catalogue-version 0.03
++++++ pst-blur.doc.tar.xz ++++++
++++++ pst-blur.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-blur.tlpobj new/tlpkg/tlpobj/pst-blur.tlpobj
--- old/tlpkg/tlpobj/pst-blur.tlpobj 2016-04-14 19:36:37.000000000 +0200
+++ new/tlpkg/tlpobj/pst-blur.tlpobj 2017-04-14 17:55:02.000000000 +0200
@@ -11,7 +11,7 @@
RELOC/tex/generic/pst-blur/pst-blur.tex
RELOC/tex/latex/pst-blur/pst-blur.sty
catalogue-ctan /graphics/pstricks/contrib/pst-blur
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics graphics-subpic pstricks
catalogue-version 2.0
++++++ pst-bspline.doc.tar.xz ++++++
++++++ pst-bspline.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-bspline.tlpobj new/tlpkg/tlpobj/pst-bspline.tlpobj
--- old/tlpkg/tlpobj/pst-bspline.tlpobj 2016-04-23 03:19:09.000000000 +0200
+++ new/tlpkg/tlpobj/pst-bspline.tlpobj 2017-04-14 17:55:03.000000000 +0200
@@ -13,7 +13,7 @@
RELOC/tex/generic/pst-bspline/pst-bspline.tex
RELOC/tex/latex/pst-bspline/pst-bspline.sty
catalogue-ctan /graphics/pstricks/contrib/pst-bspline
-catalogue-date 2016-04-21 22:42:58 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics graphics-curve pstricks
catalogue-version 1.62
++++++ pst-calendar.doc.tar.xz ++++++
++++++ pst-calendar.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-calendar.tlpobj new/tlpkg/tlpobj/pst-calendar.tlpobj
--- old/tlpkg/tlpobj/pst-calendar.tlpobj 2016-04-14 19:36:38.000000000 +0200
+++ new/tlpkg/tlpobj/pst-calendar.tlpobj 2017-04-14 17:55:03.000000000 +0200
@@ -13,7 +13,7 @@
RELOC/tex/latex/pst-calendar/pst-calendar.sty
catalogue-also calendar
catalogue-ctan /graphics/pstricks/contrib/pst-calendar
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics calendar pstricks
catalogue-version 0.47
++++++ pst-cie.doc.tar.xz ++++++
/work/SRC/openSUSE:Factory/texlive-specs-s/pst-cie.doc.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-s.new/pst-cie.doc.tar.xz differ: char 27, line 1
++++++ pst-cie.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-cie.tlpobj new/tlpkg/tlpobj/pst-cie.tlpobj
--- old/tlpkg/tlpobj/pst-cie.tlpobj 2016-05-18 03:21:45.000000000 +0200
+++ new/tlpkg/tlpobj/pst-cie.tlpobj 2017-04-14 17:55:11.000000000 +0200
@@ -12,7 +12,7 @@
RELOC/tex/generic/pst-cie/pst-cie.tex
RELOC/tex/latex/pst-cie/pst-cie.sty
catalogue-ctan /graphics/pstricks/contrib/pst-cie
-catalogue-date 2016-05-16 20:17:50 +0200
+catalogue-date 2016-11-16 07:59:52 +0100
catalogue-license lppl
-catalogue-topics pstricks colour-supp
+catalogue-topics pstricks colour
catalogue-version 1.05
++++++ pst-circ.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-circ/Changes new/doc/generic/pst-circ/Changes
--- old/doc/generic/pst-circ/Changes 2015-04-15 16:26:47.000000000 +0200
+++ new/doc/generic/pst-circ/Changes 2016-11-25 19:27:48.000000000 +0100
@@ -1,8 +1,9 @@
-2.13 2015-04-15 . added some new components (Piere Vivegnis)
-2.12a 2014-10-09 . Updated documentation
-2.12 2014-07-30 . Added new tripole powermeter.
-2.11 2014-06-24 . Added new key circ={} for specific key setting.
-2.10 2014-06-19 . Added more alternative styles (Patrice Mégret)
+2.14 2016-08-21 fix bug with \splitter
+2.13 2015-04-15 added some new components (Piere Vivegnis)
+2.12a 2014-10-09 Updated documentation
+2.12 2014-07-30 Added new tripole powermeter.
+2.11 2014-06-24 Added new key circ={} for specific key setting.
+2.10 2014-06-19 Added more alternative styles (Patrice Mégret)
fixed bug for quadrupoles
2.09 2014-05-18 - allow empty arguments for logicSymbolstyle and
logicLabelstyle
Binary files old/doc/generic/pst-circ/pst-circ-doc.pdf and new/doc/generic/pst-circ/pst-circ-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-circ/pst-circ-doc.tex new/doc/generic/pst-circ/pst-circ-doc.tex
--- old/doc/generic/pst-circ/pst-circ-doc.tex 2015-04-15 16:26:47.000000000 +0200
+++ new/doc/generic/pst-circ/pst-circ-doc.tex 2016-11-25 19:27:48.000000000 +0100
@@ -1,6 +1,6 @@
%% $Id: pst-circ-doc.tex 927 2014-06-18 11:01:59Z herbert $
-\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
- headexclude,footexclude,oneside]{pst-doc}
+\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings,
+ headexclude,footexclude,oneside,enabledeprecatedfontcommands]{pst-doc}
\usepackage[utf8]{inputenc}
\usepackage{pst-circ}
\let\pstCircFV\fileversion
@@ -593,7 +593,7 @@
\begin{LTXexample}[pos=b]
-\psset{mathlabel,labelstyle=\tt}
+\psset{mathlabel}
\def\pcTran(#1)(#2){\psline(#1)(#2|#1)(#2)}% only 2 segements
\psset{circedge=\pcTran,connectingdot=false}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-circ.doc.tlpobj new/tlpkg/tlpobj/pst-circ.doc.tlpobj
--- old/tlpkg/tlpobj/pst-circ.doc.tlpobj 2016-04-14 19:36:38.000000000 +0200
+++ new/tlpkg/tlpobj/pst-circ.doc.tlpobj 2017-04-14 17:55:11.000000000 +0200
@@ -1,9 +1,9 @@
name pst-circ.doc
category Package
-revision 36865
+revision 41901
shortdesc doc files of pst-circ
relocated 1
-docfiles size=216
+docfiles size=245
RELOC/doc/generic/pst-circ/Changes
RELOC/doc/generic/pst-circ/README
RELOC/doc/generic/pst-circ/pst-circ-doc.bib
++++++ pst-circ.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/pst-circ/pst-circ.tex new/tex/generic/pst-circ/pst-circ.tex
--- old/tex/generic/pst-circ/pst-circ.tex 2015-04-15 16:26:47.000000000 +0200
+++ new/tex/generic/pst-circ/pst-circ.tex 2016-11-25 19:33:37.000000000 +0100
@@ -26,8 +26,8 @@
\ifx\PSTXKeyLoaded\endinput \else\input pst-xkey \fi
\ifx\PSTMultidoLoaded\endinput\else\input multido.tex\fi
%
-\def\fileversion{2.13}
-\def\filedate{2015/04/15}
+\def\fileversion{2.14}
+\def\filedate{2016/08/21}
\message{`pst-circ' v\fileversion (hv)}
%
\edef\PstAtCode{\the\catcode`\@}
@@ -5472,14 +5472,14 @@
\ifPst@inputarrow
\ncangle[arrows=->,arrowinset=0,arm=0.5,angleB=180]{#1}{Tport@left}
\else
- \ncangle[arrows=-,arm=0.5,angleB=0]{#1}{Tport@left}
+ \ncangle[arrows=-,arm=0.5,angleB=180]{#1}{Tport@left}
\fi
\ncangle[arrows=-, arm=0.5,angleB=0]{#2}{Tport@right}
\else
\ifPst@inputarrow
\ncangle[arrows=->,arrowinset=0,arm=0.5,angleB=0]{#2}{Tport@right}
\else
- \ncangle[arrows=-,arm=0.5,angleB=180]{Tport@right}{#2}
+ \ncangle[arrows=-,arm=0.5,angleB=0]{#2}{Tport@right}
\fi
\ncangle[arrows=-,arm=0.5,angleB=180]{#1}{Tport@left}
\fi
@@ -5500,10 +5500,10 @@
\fi
\else
\ifx\psk@tripole@style\pst@tripole@style@top%
- \psline[linewidth=1.5\pslinewidth](-0.5,-0.5)(0.5,0.5)
- \else
- \psline[linewidth=1.5\pslinewidth](-0.5,0.5)(0.5,-0.5)
- \fi
+ \psline[linewidth=1.5\pslinewidth](-0.5,-0.5)(0.5,0.5)
+ \else
+ \psline[linewidth=1.5\pslinewidth](-0.5,0.5)(0.5,-0.5)
+ \fi
\fi
\pnodes(-0.5,0){Tport@left}(0.5,0){Tport@right}%
\pcline[offset=\psk@label@offset,linestyle=none](Tport@left)(Tport@right)\ncput{#2}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-circ.tlpobj new/tlpkg/tlpobj/pst-circ.tlpobj
--- old/tlpkg/tlpobj/pst-circ.tlpobj 2016-04-14 19:36:38.000000000 +0200
+++ new/tlpkg/tlpobj/pst-circ.tlpobj 2017-04-14 17:55:11.000000000 +0200
@@ -1,6 +1,6 @@
name pst-circ
category Package
-revision 36865
+revision 41901
shortdesc PSTricks package for drawing electric circuits
relocated 1
longdesc The package is built using PSTricks and in particular pst-node.
@@ -15,7 +15,7 @@
RELOC/tex/generic/pst-circ/pst-circ.tex
RELOC/tex/latex/pst-circ/pst-circ.sty
catalogue-ctan /graphics/pstricks/contrib/pst-circ
-catalogue-date 2016-02-07 10:49:28 +0100
+catalogue-date 2016-08-21 19:53:03 +0200
catalogue-license lppl
catalogue-topics diagram-circ pstricks
-catalogue-version 2.13
+catalogue-version 2.14
++++++ pst-coil.doc.tar.xz ++++++
++++++ pst-coil.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-coil.tlpobj new/tlpkg/tlpobj/pst-coil.tlpobj
--- old/tlpkg/tlpobj/pst-coil.tlpobj 2016-04-14 19:36:39.000000000 +0200
+++ new/tlpkg/tlpobj/pst-coil.tlpobj 2017-04-14 17:55:11.000000000 +0200
@@ -10,7 +10,7 @@
RELOC/tex/generic/pst-coil/pst-coil.tex
RELOC/tex/latex/pst-coil/pst-coil.sty
catalogue-ctan /graphics/pstricks/contrib/pst-coil
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics graphics-use pstricks
catalogue-version 1.07
++++++ pst-cox.doc.tar.xz ++++++
++++++ pst-cox.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-cox.tlpobj new/tlpkg/tlpobj/pst-cox.tlpobj
--- old/tlpkg/tlpobj/pst-cox.tlpobj 2016-04-14 19:36:40.000000000 +0200
+++ new/tlpkg/tlpobj/pst-cox.tlpobj 2017-04-14 17:55:12.000000000 +0200
@@ -25,7 +25,7 @@
RELOC/tex/latex/pst-cox/pst-coxcoor.sty
RELOC/tex/latex/pst-cox/pst-coxeterp.sty
catalogue-ctan /graphics/pstricks/contrib/pst-cox
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lgpl
catalogue-topics physics maths pstricks
catalogue-version 0.98 Beta
++++++ pst-dbicons.doc.tar.xz ++++++
++++++ pst-dbicons.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-dbicons.tlpobj new/tlpkg/tlpobj/pst-dbicons.tlpobj
--- old/tlpkg/tlpobj/pst-dbicons.tlpobj 2016-04-14 19:36:42.000000000 +0200
+++ new/tlpkg/tlpobj/pst-dbicons.tlpobj 2017-04-14 17:55:13.000000000 +0200
@@ -14,7 +14,7 @@
runfiles size=3
RELOC/tex/latex/pst-dbicons/pst-dbicons.sty
catalogue-ctan /graphics/pstricks/contrib/pst-dbicons
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics diagram pstricks
catalogue-version 0.16
++++++ pst-diffraction.doc.tar.xz ++++++
++++++ pst-diffraction.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-diffraction.tlpobj new/tlpkg/tlpobj/pst-diffraction.tlpobj
--- old/tlpkg/tlpobj/pst-diffraction.tlpobj 2016-04-14 19:36:44.000000000 +0200
+++ new/tlpkg/tlpobj/pst-diffraction.tlpobj 2017-04-14 17:55:13.000000000 +0200
@@ -17,7 +17,7 @@
RELOC/tex/generic/pst-diffraction/pst-diffraction.tex
RELOC/tex/latex/pst-diffraction/pst-diffraction.sty
catalogue-ctan /graphics/pstricks/contrib/pst-diffraction
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics graphics-use pstricks
catalogue-version 2.03
++++++ pst-electricfield.doc.tar.xz ++++++
++++++ pst-electricfield.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-electricfield.tlpobj new/tlpkg/tlpobj/pst-electricfield.tlpobj
--- old/tlpkg/tlpobj/pst-electricfield.tlpobj 2016-04-14 19:36:49.000000000 +0200
+++ new/tlpkg/tlpobj/pst-electricfield.tlpobj 2017-04-14 17:55:16.000000000 +0200
@@ -12,7 +12,7 @@
RELOC/tex/generic/pst-electricfield/pst-electricfield.tex
RELOC/tex/latex/pst-electricfield/pst-electricfield.sty
catalogue-ctan /graphics/pstricks/contrib/pst-electricfield
-catalogue-date 2015-08-15 05:39:34 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics graphics-use pstricks
catalogue-version 0.14
++++++ pst-eps.doc.tar.xz ++++++
++++++ pst-eps.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-eps.tlpobj new/tlpkg/tlpobj/pst-eps.tlpobj
--- old/tlpkg/tlpobj/pst-eps.tlpobj 2016-04-14 19:36:49.000000000 +0200
+++ new/tlpkg/tlpobj/pst-eps.tlpobj 2017-04-14 17:55:16.000000000 +0200
@@ -10,7 +10,7 @@
RELOC/tex/generic/pst-eps/pst-eps.tex
RELOC/tex/latex/pst-eps/pst-eps.sty
catalogue-ctan /graphics/pstricks/contrib/pst-eps
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics graphics-prep pstricks
catalogue-version 1.0
++++++ pst-eucl-translation-bg.doc.tar.xz ++++++
++++++ pst-eucl.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-eucl/Changes new/doc/generic/pst-eucl/Changes
--- old/doc/generic/pst-eucl/Changes 2015-10-20 23:19:10.000000000 +0200
+++ new/doc/generic/pst-eucl/Changes 2017-04-18 23:30:48.000000000 +0200
@@ -4,6 +4,13 @@
pst-eucl.tex --------
+
+1.56 2017/04/18 - \psGetAngleABC:
+ - added dec -1 le { /dec 15 def } if
+ - added \pst@usecolor\pslinecolor in line 1616
+1.55 2016/10/11 - fix for \pstRightAngle
+1.54 2016/09/01 - added MarkArrow, MarkArroww,MarkArrowww
+1.53 2016/05/03 - revert changes of CodeFig(A|B)
1.52 2015/10/19 - added more optional arguments (ts)
1.51 2014/05/17 - added two new functions for angles and distances
1.50 2014/04/05 - added MarkHashLength|Sep (hv)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-eucl/README new/doc/generic/pst-eucl/README
--- old/doc/generic/pst-eucl/README 2014-04-06 00:21:37.000000000 +0200
+++ new/doc/generic/pst-eucl/README 2016-11-25 19:27:48.000000000 +0100
@@ -1,4 +1,4 @@
- the pst-eucl package
+pst-eucl package
This program can be redistributed and/or modified under the terms
of the LaTeX Project Public License Distributed from CTAN
@@ -27,10 +27,3 @@
run `texhash`
- if you don't have a local texmf directory, you can create it or ask
- the root to create it by modifying the file:
-
- $(TEXMF)/web2c/texmf.cnf
-
- remove the original for the first line:
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-eucl/pst-eucl-doc.bib new/doc/generic/pst-eucl/pst-eucl-doc.bib
--- old/doc/generic/pst-eucl/pst-eucl-doc.bib 2014-05-18 23:48:17.000000000 +0200
+++ new/doc/generic/pst-eucl/pst-eucl-doc.bib 2016-11-25 19:27:48.000000000 +0100
@@ -51,9 +51,9 @@
@Book{PSTricks2,
author = {Herbert Vo\ss{}},
title = {\texttt{PSTricks} -- {G}rafik f\"ur \TeX{} und \LaTeX},
- edition = {6.},
+ edition = {7},
publisher = {DANTE -- Lehmanns},
- year = {2010},
+ year = {2016},
address = {Heidelberg/Hamburg}
}
Binary files old/doc/generic/pst-eucl/pst-eucl-doc.pdf and new/doc/generic/pst-eucl/pst-eucl-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-eucl/pst-eucl-doc.tex new/doc/generic/pst-eucl/pst-eucl-doc.tex
--- old/doc/generic/pst-eucl/pst-eucl-doc.tex 2014-05-18 23:48:17.000000000 +0200
+++ new/doc/generic/pst-eucl/pst-eucl-doc.tex 2016-11-25 19:27:48.000000000 +0100
@@ -2,8 +2,8 @@
headexclude,footexclude,oneside,english]{pst-doc}
\usepackage[utf8]{inputenc}
\usepackage{pst-eucl}
-\usepackage{multicol}
\let\pstEuclideFV\fileversion
+\usepackage{multicol}
\usepackage{pst-plot,paralist}
\usepackage[mathscr]{eucal}
\lstset{pos=l,wide=false,language=PSTricks,
@@ -12,6 +12,9 @@
\def\Argsans#1{$\langle$#1$\rangle$}
\def\DefaultVal#1{(by default #1)}
+\usepackage{biblatex}
+\addbibresource{\jobname.bib}
+
\title{\texttt{pst-euclide}}
\subtitle{A PSTricks package for drawing geometric pictures; v.\pstEuclideFV}
@@ -258,6 +261,9 @@
\item \Seg{MarkHashhh}
\item \Seg{MarkCros}
\item \Seg{MarkCross}
+ \item \Seg{MarkArrow}
+ \item \Seg{MarkArroww}
+ \item \Seg{MarkArrowww}
\end{compactitem}
\end{multicols}
\endgroup
@@ -396,6 +402,30 @@
\end{LTXexample}
+\begin{LTXexample}[width=\linewidth,pos=t]
+\begin{pspicture}(-0.5,-0.5)(9,3)
+\psset{PointSymbol=none,PointNameMathSize=\scriptstyle,PointNameSep=6pt,
+ RightAngleSize=0.15,PosAngle={135,225,-45,45}}
+\psaxes[ticks=none,labels=none] {->}(0,0)(9,3)
+\pstGeonode(1,2){A}(1,1){B}(2,1){C}(2,2){D}%
+\pstRightAngle{C}{B}{A} \pstRightAngle{D}{C}{B}
+\pstRightAngle{A}{D}{C} \pstRightAngle{B}{A}{D}
+\pspolygon(A)(B)(C)(D)
+\psset{RightAngleType=suisseromand}
+\pstGeonode(3,2){A}(3,1){B}(4,1){C}(4,2){D}%
+\pstRightAngle{C}{B}{A} \pstRightAngle{D}{C}{B}
+\pstRightAngle{A}{D}{C} \pstRightAngle{B}{A}{D}
+\pspolygon(A)(B)(C)(D)
+\psset{RightAngleType=german}
+\pstGeonode(5,2){A}(5,1){B}(6,1){C}(6,2){D}%
+\pstRightAngle{C}{B}{A} \pstRightAngle{D}{C}{B}
+\pstRightAngle{A}{D}{C} \pstRightAngle{B}{A}{D}
+\pspolygon(A)(B)(C)(D)
+\end{pspicture}
+\end{LTXexample}
+
+
+
\subsection{Lines, half-lines and segments}
@@ -2028,8 +2058,8 @@
\nocite{*}
\bgroup
\RaggedRight
-\bibliographystyle{plain}
-\bibliography{pst-eucl-doc}
+%\bibliographystyle{plain}
+\printbibliography{pst-eucl-doc}
\egroup
\printindex
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-eucl.doc.tlpobj new/tlpkg/tlpobj/pst-eucl.doc.tlpobj
--- old/tlpkg/tlpobj/pst-eucl.doc.tlpobj 2016-04-14 19:36:49.000000000 +0200
+++ new/tlpkg/tlpobj/pst-eucl.doc.tlpobj 2017-04-19 02:06:48.000000000 +0200
@@ -1,9 +1,9 @@
name pst-eucl.doc
category Package
-revision 38678
+revision 43911
shortdesc doc files of pst-eucl
relocated 1
-docfiles size=151
+docfiles size=153
RELOC/doc/generic/pst-eucl/Changes
RELOC/doc/generic/pst-eucl/README
RELOC/doc/generic/pst-eucl/pst-eucl-doc.bib
++++++ pst-eucl.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/pst-eucl/pst-eucl.tex new/tex/generic/pst-eucl/pst-eucl.tex
--- old/tex/generic/pst-eucl/pst-eucl.tex 2015-10-20 23:19:10.000000000 +0200
+++ new/tex/generic/pst-eucl/pst-eucl.tex 2017-04-18 23:30:48.000000000 +0200
@@ -10,15 +10,15 @@
%% : hv herbert@dante.de
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Require PSTricks and pst-node packages
-\ifx\PSTricksLoaded\endinput\else\input pstricks.tex\fi
\ifx\PSTnodesLoaded\endinput\else\input pst-node.tex\fi
+\ifx\PSTArrowLoaded\endinput\else\input pst-arrow.tex\fi
\ifx\PSTtoolsLoaded\endinput\else\input pst-tools.tex\fi
-\ifx\PSTXKeyLoaded\endinput\else \input pst-xkey\fi
+%\ifx\PSTXKeyLoaded\endinput\else \input pst-xkey\fi
\ifx\MultidoLoaded\endinput \else\input multido.tex \fi
\csname PSTEuclideLoaded\endcsname
\let\PSTEuclideLoaded\endinput
-\def\fileversion{1.52}
-\def\filedate{2015/10/19}
+\def\fileversion{1.56}
+\def\filedate{2017/04/18}
%% This program can be redistributed and/or modified under the terms
%% of the LaTeX Project Public License Distributed from CTAN
%% archives in directory macros/latex/base/lppl.txt.
@@ -47,13 +47,15 @@
% use math mode in point name
\newif\ifPst@PtNameMath%
\define@key[psset]{pst-eucl}{PtNameMath}[false]{\@nameuse{Pst@PtNameMath#1}}%
+\define@key[psset]{pst-eucl}{PointNameSize}[\normalsize]{\def\Point@Name@Size{#1}}%
+\define@key[psset]{pst-eucl}{PointNameMathSize}[\textnormal]{\def\Point@Name@MathSize{#1}}%
% symbol used for marking equal length segment
-\define@key[psset]{pst-eucl}{SegmentSymbol}[MarkHashh]{\edef\psk@SegmentSymbol{#1}}%
-\define@key[psset]{pst-eucl}{SegmentSymbolA}[MarkHashh]{\edef\psk@SegmentSymbolA{#1}}%
-\define@key[psset]{pst-eucl}{SegmentSymbolB}[MarkHashh]{\edef\psk@SegmentSymbolB{#1}}%
-\define@key[psset]{pst-eucl}{SegmentSymbolC}[MarkHashh]{\edef\psk@SegmentSymbolC{#1}}%
-\define@key[psset]{pst-eucl}{Mark}[undef]{\edef\psk@Mark{#1}}%
-\define@key[psset]{pst-eucl}{mark}[undef]{\edef\psk@mark{Angle#1}}% for angles
+\define@key[psset]{pst-eucl}{SegmentSymbol}[MarkHashh]{\def\psk@SegmentSymbol{#1}}%
+\define@key[psset]{pst-eucl}{SegmentSymbolA}[MarkHashh]{\def\psk@SegmentSymbolA{#1}}%
+\define@key[psset]{pst-eucl}{SegmentSymbolB}[MarkHashh]{\def\psk@SegmentSymbolB{#1}}%
+\define@key[psset]{pst-eucl}{SegmentSymbolC}[MarkHashh]{\def\psk@SegmentSymbolC{#1}}%
+\define@key[psset]{pst-eucl}{Mark}[undef]{\def\psk@Mark{#1}}%
+\define@key[psset]{pst-eucl}{mark}[undef]{\def\psk@mark{Angle#1}}% for angles
\define@key[psset]{pst-eucl}{MarkAngle}[undef]{\edef\psk@MarkAngle{#1}}%
\newdimen\psMarkHashLength
\newdimen\psMarkHashSep
@@ -132,7 +134,8 @@
\psset[pst-eucl]{%
PointSymbol=default, PointSymbolA=undef, PointSymbolB=undef, PointSymbolC=undef,
PointName=default, PointNameA=undef, PointNameB=undef, PointNameC=undef,
- PtNameMath=true, PointNameSep=default, PosAngle=undef, PosAngleA=undef,
+ PtNameMath=true, PointNameMathSize=\textstyle, PointNameSize=\normalsize,
+ PointNameSep=default, PosAngle=undef, PosAngleA=undef,
PosAngleB=undef, PosAngleC=undef, Mark=undef, mark=undef,SegmentSymbol=MarkHashh,
SegmentSymbolA=MarkHashh, SegmentSymbolB=MarkHash, SegmentSymbolC=MarkHashhh,
RightAngleSize=.4, RightAngleType=default, LabelAngleOffset=0, LabelSep=1,
@@ -251,7 +254,7 @@
\xdef\@@GenCourbe{\@@GenCourbe(#5)}%%for accumulating points% DR 22032005
\Pst@ManageParamList{#5}%
\@ifnextchar({\Pst@OIJGeonode@iii{#1}{#2}{#3}}{\pst@MngTransformCurve\endgroup}}% DR 22032005
-%%end modif DR 11/2003
+%%end modif DR 11/2003
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% #1 -> point coordinates
\def\Pst@geonodelabel#1{% % {nodename}
@@ -267,7 +270,7 @@
\ifx\psk@PointName\@none\else
\rput{*0}([nodesep=\ifx\psk@PointNameSep\@default{1em}\else\psk@PointNameSep\fi,
angle=\ifx\psk@PosAngle\@undef{0}\else\psk@PosAngle\fi]#1)%
- {\ifPst@PtNameMath $\Pst@WhichLabel{#1}$\else\Pst@WhichLabel{#1}\fi}
+ {\ifPst@PtNameMath $\Point@Name@MathSize\Pst@WhichLabel{#1}$\else\Point@Name@Size\Pst@WhichLabel{#1}\fi}
\fi}%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\def\Pst@WhichLabel#1{\ifx\psk@PointName\@default#1\else\psk@PointName\fi}%DR 0
@@ -277,7 +280,7 @@
\def\Pst@SegmentMark[#1]#2#3{%
\bgroup\psset{#1}% % Affectation of local parameters
\ncline[nodesep=0]{#2}{#3}
- \ncput[nrot=:U]{$\csname\psk@SegmentSymbol\endcsname$}%
+ \ncput[nrot=:U]{$\expandafter\@nameuse\expandafter{\psk@SegmentSymbol}$}% $
\egroup%
}%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -348,6 +351,19 @@
\let\AngleMarkCross\MarkCross
\def\MarkCirc{\pscircle(0,0){2\pslinewidth}}
\let\AngleMarkCirc\MarkCirc
+% MarkArrow >
+\def\MarkArrow{%
+ \psline[linestyle=none,veearrowlength=\psMarkHashLength,
+ veearrowangle=90,veearrowlinewidth=\pslinewidth,
+ ArrowInside=-v](-\psMarkHashLength,0)(\psMarkHashLength,0)}%
+\def\MarkArroww{%
+ \psline[linestyle=none,veearrowlength=\psMarkHashLength,
+ veearrowangle=90,veearrowlinewidth=\pslinewidth,
+ ArrowInsideNo=2,ArrowInside=-v](-2\psMarkHashLength,0)(2\psMarkHashLength,0)}%
+\def\MarkArrowww{%
+ \psline[linestyle=none,veearrowlength=\psMarkHashLength,
+ veearrowangle=90,veearrowlinewidth=\pslinewidth,
+ ArrowInsideNo=3,ArrowInside=-v](-2.5\psMarkHashLength,0)(2.5\psMarkHashLength,0)}%
%
%%end modif alaindelplanque 11/2003
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -360,25 +376,29 @@
%% not good at all, but \rput{0}(#3){\rput{(#2)}{stuff}} doesn't work...
\rput(#2){%
\ifx\psk@RightAngleType\@default%
- \pspolygon(0,0)%%modif 12/2004
- (!tx@EcldDict begin /N@#3 GetNode exch Atan \psk@RightAngleSize\space exch PtoC end)%
- (!tx@EcldDict begin /N@#3 GetNode exch Atan /N@#1 GetNode exch Atan
- 2 copy sub abs 91 gt
- { 2 copy lt { exch 360 add exch } { 360 add } ifelse } if %%DR 2005/01/14
- %%2 copy lt { exch 360 sub exch } if
- add 2 div 2 sqrt \psk@RightAngleSize\space mul exch PtoC end)%
- (!tx@EcldDict begin /N@#1 GetNode exch Atan \psk@RightAngleSize\space exch PtoC end)%
- \else\ifx\psk@RightAngleType\@german%
- \pstMarkAngle[MarkAngleRadius=\psk@RightAngleSize,LabelSep=\psk@RightAngleSize\space .5 mul]{#1}{#2}{#3}%
- {\psscalebox{\psk@RightAngleSize}{\pscircle*{.08}}}%
- \else\ifx\psk@RightAngleType\@suisseromand%
- \rput{*0}%
- (!tx@EcldDict begin /N@#3 GetNode exch Atan /N@#1 GetNode exch Atan
- 2 copy lt { exch 360 sub exch } if add 2 div .45 \psk@RightAngleSize\space mul exch PtoC end)%
- {\psscalebox{\psk@RightAngleSize}{\pscircle*{.08}}}%
- \pspolygon(0,0)%
- (!tx@EcldDict begin /N@#3 GetNode exch Atan \psk@RightAngleSize\space exch PtoC end )%
- (!tx@EcldDict begin /N@#1 GetNode exch Atan \psk@RightAngleSize\space exch PtoC end )%
+ \psline(!tx@EcldDict begin /N@#1 GetNode exch Atan
+ \psk@RightAngleSize\space exch PtoC end)%
+ (!tx@EcldDict begin /N@#1 GetNode exch Atan /AngleNo1 ED
+ tx@EcldDict begin /N@#3 GetNode exch Atan /AngleNo3 ED
+ AngleNo1 AngleNo3 sub abs 180 gt { /Diff -45 def }{ /Diff 45 def } ifelse
+ AngleNo1 AngleNo3 gt { AngleNo1 Diff sub }{ AngleNo3 Diff sub } ifelse
+ \psk@RightAngleSize\space 2 sqrt mul exch PtoC end)%
+ (!tx@EcldDict begin /N@#3 GetNode exch Atan
+ \psk@RightAngleSize\space exch PtoC end)%
+ \else
+ \ifx\psk@RightAngleType\@german
+ \pstMarkAngle[MarkAngleRadius=\psk@RightAngleSize,LabelSep=\psk@RightAngleSize\space .5 mul]{#1}{#2}{#3}%
+ {\psscalebox{\psk@RightAngleSize}{\pscircle*{.08}}}%
+ \else
+ \ifx\psk@RightAngleType\@suisseromand
+ \rput{*0}%
+ (!tx@EcldDict begin /N@#3 GetNode exch Atan /N@#1 GetNode exch Atan
+ 2 copy lt { exch 360 sub exch } if add 2 div .45 \psk@RightAngleSize\space mul exch PtoC end)%
+ {\psscalebox{\psk@RightAngleSize}{\pscircle*{.08}}}%
+% \pspolygon(0,0)%
+ \psline(0,0)%
+ (!tx@EcldDict begin /N@#3 GetNode exch Atan \psk@RightAngleSize\space exch PtoC end )%
+ (!tx@EcldDict begin /N@#1 GetNode exch Atan \psk@RightAngleSize\space exch PtoC end )%
\fi\fi\fi}%
\endgroup\ignorespaces% hv 20130312
}%
@@ -400,8 +420,8 @@
\rput[\psk@LabelRefPt]{*0}(! tx@EcldDict begin
/N@#4 GetNode exch Atan /N@#2 GetNode exch Atan end
2 copy lt { exch 360 sub exch } if
- add 2 div dup /psRawLabelPos ED
- \psk@LabelAngleOffset\space add
+ add 2 div dup /psRawLabelPos ED
+ \psk@LabelAngleOffset\space add
\psk@LabelSep\space exch PtoC ){#5}%
\def\pst@tempA{Angleundef}%
%% define \pst@rot@angle to make it compatible with xelatex for later use
@@ -440,9 +460,9 @@
\psset{PosAngleA={!
/AngleAB \@@coordi\space\@@coordiii\space tx@EcldDict begin ABVect end exch Atan def
/AngleAC \@@coordi\space\@@coordv\space tx@EcldDict begin ABVect end exch Atan def
- AngleAB AngleAC add 2 div dup
+ AngleAB AngleAC add 2 div dup
1 exch \tx@PtoC exch \@@coordi\space 4 1 roll add 3 1 roll add XS YS Pyth2 % test if inside/outside
- \@@coordi\space XS YS Pyth2 le { 180 add } if
+ \@@coordi\space XS YS Pyth2 le { 180 add } if
}}%% <------ hv
\else\psset{PosAngle=\psk@PosAngleA}\fi
%%end modif alaindelplanque 11/2003
@@ -467,10 +487,10 @@
%%begin modif alaindelplanque 11/2003
\ifx\psk@PosAngleC\@undef
\psset{PosAngleC={!
- /AngleCB \@@coordv\space\@@coordiii\space tx@EcldDict begin ABVect end exch Atan def
- /AngleCA \@@coordv\space\@@coordi\space tx@EcldDict begin ABVect end exch Atan def
+ /AngleCB \@@coordv\space\@@coordiii\space tx@EcldDict begin ABVect end exch Atan def
+ /AngleCA \@@coordv\space\@@coordi\space tx@EcldDict begin ABVect end exch Atan def
AngleCB AngleCA add 2 div dup 1 exch \tx@PtoC exch \@@coordv\space 4 1 roll add 3 1 roll add XS YS Pyth2
- \@@coordv\space XS YS Pyth2 le { 180 add } if
+ \@@coordv\space XS YS Pyth2 le { 180 add } if
}}%% <------ hv
\else\psset{PosAngle=\psk@PosAngleC}\fi%% <----------------------- hv
%%end modif alaindelplanque 11/2003
@@ -960,7 +980,7 @@
/N@#2 GetNode /N@#3 GetNode /N@#4 GetNode /N@#5 GetNode InterLines
end
\pst@number\psyunit div exch \pst@number\psxunit div exch
- 2 copy
+ 2 copy
/#6.Y exch def /#6.X exch def % save the coors for futher use
){#6}%
\Pst@geonodelabel{#6}%
@@ -1084,14 +1104,14 @@
\egroup
\psset{linecolor=\psk@CodeFigColor, linestyle=\psk@CodeFigStyle, arcsep=-1}%
\ifx\psk@CodeFigA\@undef%
- \ifx\psk@CodeFigB\@undef\ifPst@CodeFig\ifPst@CodeFigAarc\pstArcOAB{#2}{#6}{#7}\else\pstArcnOAB{#2}{#6}{#7}\fi\fi\fi
+ \ifx\psk@CodeFigB\@undef\ifPst@CodeFig\pstArcOAB{#2}{#6}{#7}\fi\fi
\else%
- \ifx\psk@CodeFigA\@none \ifPst@CodeFigA\ifPst@CodeFigAarc\pstArcOAB{#2}{#6}{#7}\else\pstArcnOAB{#2}{#6}{#7}\fi\fi\fi
+ \ifPst@CodeFigAarc\pstArcOAB{#2}{#6}{#7}\else\pstArcnOAB{#2}{#6}{#7}\fi%
\fi
\ifx\psk@CodeFigB\@undef%
- \ifx\psk@CodeFigA\@undef\ifPst@CodeFig\ifPst@CodeFigBarc\pstArcOAB{#4}{#6}{#7}\else\pstArcnOAB{#4}{#6}{#7}\fi\fi\fi
- \else
- \ifx\psk@CodeFigB\@none \ifPst@CodeFigB\ifPst@CodeFigBarc\pstArcOAB{#4}{#6}{#7}\else\pstArcnOAB{#4}{#6}{#7}\fi\fi\fi
+ \ifx\psk@CodeFigA\@undef\ifPst@CodeFig\pstArcOAB{#4}{#6}{#7}\fi\fi
+ \else%
+ \ifPst@CodeFigBarc\pstArcOAB{#4}{#6}{#7}\else\pstArcnOAB{#4}{#6}{#7}\fi%
\fi
\egroup
}%
@@ -1108,10 +1128,10 @@
% end){\pnode{#5}}%
\pnode(!
tx@EcldDict begin
- #4
+ #4
{ \ifPst@algebraic (#3) AlgParser cvx exec \else #3 \fi }
{ \ifPst@algebraic (#2) AlgParser cvx exec \else #2 \fi }
- NewtonSolving pop
+ NewtonSolving pop
2 copy end
/#5.Y exch def /#5.X exch def % save the coors for futher use
){#5}%
@@ -1131,16 +1151,16 @@
% #5 { /N@#3 GetNode /N@#4 GetNode EqDr 1 index div
% \pst@number\psxunit div 3 1 roll div x mul add } { #2 }
% NewtonSolving pop
-% end){\pnode{#6}}%
+% end){\pnode{#6}}%
\pnode(!
tx@EcldDict begin
- #5
+ #5
{ /N@#3 GetNode /N@#4 GetNode EqDr 1 index div
- \pst@number\psxunit div 3 1 roll div x mul add }
+ \pst@number\psxunit div 3 1 roll div x mul add }
{ \ifPst@algebraic (#2) AlgParser cvx exec \else #2 \fi }
- NewtonSolving pop 2 copy end
+ NewtonSolving pop 2 copy end
/#5.Y exch def /#5.X exch def % save the coors for futher use
- ){#6}%
+ ){#6}%
\Pst@geonodelabel{#6}%
\egroup%
}
@@ -1157,17 +1177,17 @@
\edef\@function{ \ifPst@algebraic (#1) AlgParser cvx exec \else #1 \fi\space }%
\pnode(!
tx@EcldDict begin
- #4
+ #4
{ /N@#2 GetNode 2 copy /N@#3 GetNode ABDist \pst@number\psxunit div
3 1 roll \pst@number\psyunit div exch \pst@number\psxunit div exch x \@function
- ABDist sub }
- { 0 }
+ ABDist sub }
+ { 0 }
NewtonSolving pop
- pop dup /x exch def
+ pop dup /x exch def
\@function
2 copy end
/#4.Y exch def /#4.X exch def % save the coors for futher use
- ){#5}%
+ ){#5}%
\Pst@geonodelabel{#5}%
\endgroup
\ignorespaces
@@ -1516,10 +1536,10 @@
\fi
}
%% angle defined by three points
-\def\pstAngleAOB#1#2#3{%
+\def\pstAngleAOB#1#2#3{%
% \pstGeonode[PointName=none,PointSymbol=none](#1){temp@1}(#2){temp@2}(#3){temp@3}%
% \pstAngleAOB@i{temp@1}{temp@2}{temp@3}}
-%\def\pstAngleAOB@i#1#2#3{%
+%\def\pstAngleAOB@i#1#2#3{%
tx@EcldDict begin /N@#2 GetNode /N@#3 GetNode ABVect /N@#2 GetNode /N@#1 GetNode ABVect end
4 copy exch 4 -1 roll mul
3 -2 roll mul add
@@ -1529,19 +1549,19 @@
\fi
}
%
-\def\psGetDistanceAB{\pst@object{psGetDistanceAB}}% Thmoas Söll 20140512
+\def\psGetDistanceAB{\pst@object{psGetDistanceAB}}% Thmoas S\"{o}ll 20140512
\def\psGetDistanceAB@i(#1)(#2)#3{%
\begingroup%
\pst@killglue
\use@par
\pst@getcoor{#1}\pst@tempA
\pst@getcoor{#2}\pst@tempB
-\pnode(!
+\pnode(!
15 dict begin
/dec \psk@decimals\space def
\psk@PSfont findfont \psk@fontscale scalefont setfont
/laenge {10 dec exp mul round 10 dec exp div 15 string cvs stringwidth } def
- /Wert { 10 dec exp mul round 10 dec exp div dec 0 eq {cvi 15 string cvs} {15 string cvs } ifelse
+ /Wert { dec -1 le { /dec 15 def } if 10 dec exp mul round 10 dec exp div dec 0 eq {cvi 15 string cvs} {15 string cvs } ifelse
\ifPst@comma dot2comma \fi show } def
\pst@tempA \tx@UserCoor /y1 ED /x1 ED
\pst@tempB \tx@UserCoor /y2 ED /x2 ED
@@ -1568,8 +1588,8 @@
\define@key[psset]{pst-eucl}{WedgeOpacity}{\def\psk@WedgeOpacity{#1}}%
\psset[pst-eucl]{ArcColor=black,WedgeColor=blue,WedgeOpacity=0.2,AngleValue=false,
AngleArc,ShowWedge,ArcLinestyle=solid,ArcLinewidth=0.8pt,WedgeFillstyle=solid}
-
-\def\psGetAngleABC{\pst@object{psGetAngleABC}}% Thmoas Söll 20151018
+
+\def\psGetAngleABC{\pst@object{psGetAngleABC}}% Thmoas S\"{o}ll 20151018
\def\psGetAngleABC@i(#1)(#2)(#3)#4{%
\begingroup
\use@par
@@ -1593,10 +1613,10 @@
\fi
\pnode(! %
/dec \psk@decimals\space def
- \psk@PSfont findfont \psk@fontscale scalefont setfont
+ \psk@PSfont findfont \psk@fontscale scalefont setfont \pst@usecolor\pslinecolor
/s1 { /Symbol findfont \psk@fontscale\space scalefont setfont } bind def
/laenge {10 dec exp mul round 10 dec exp div 15 string cvs stringwidth } def
- /WertZeigen {10 dec exp mul round 10 dec exp div dec 0 eq {cvi 15 string cvs} {15 string cvs } ifelse
+ /WertZeigen { dec -1 le { /dec 15 def } if 10 dec exp mul round 10 dec exp div dec 0 eq {cvi 15 string cvs} {15 string cvs } ifelse
\ifPst@comma dot2comma \fi show s1 (\string\260) show} def
\pst@tempA \tx@UserCoor /y1 ED /x1 ED
\pst@tempB \tx@UserCoor /y2 ED /x2 ED
@@ -1618,8 +1638,5 @@
\catcode`\@=\PstAtCode\relax
%
\endinput
-%%
-%%
-%% END pst-eps.tex
%% END: pst-euclide.tex
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-eucl.tlpobj new/tlpkg/tlpobj/pst-eucl.tlpobj
--- old/tlpkg/tlpobj/pst-eucl.tlpobj 2016-04-14 19:36:49.000000000 +0200
+++ new/tlpkg/tlpobj/pst-eucl.tlpobj 2017-04-19 02:06:48.000000000 +0200
@@ -1,6 +1,6 @@
name pst-eucl
category Package
-revision 38678
+revision 43911
shortdesc Euclidian geometry with PSTricks
relocated 1
longdesc The package allows the drawing of Euclidean geometric figures
@@ -8,13 +8,13 @@
longdesc constraints. It is thus possible to build point using common
longdesc transformations or intersections. The use of coordinates is
longdesc limited to points which controlled the figure.
-runfiles size=20
+runfiles size=21
RELOC/dvips/pst-eucl/pst-eucl.pro
RELOC/tex/generic/pst-eucl/pst-eucl.tex
RELOC/tex/latex/pst-eucl/pst-eucl.sty
catalogue-also eukleides tkz-euclide
catalogue-ctan /graphics/pstricks/contrib/pst-eucl
-catalogue-date 2015-10-19 21:09:03 +0200
+catalogue-date 2017-04-18 21:26:16 +0200
catalogue-license lppl
catalogue-topics maths graphics-use
-catalogue-version 1.52
+catalogue-version 1.56
++++++ pst-exa.doc.tar.xz ++++++
++++++ pst-exa.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-exa.tlpobj new/tlpkg/tlpobj/pst-exa.tlpobj
--- old/tlpkg/tlpobj/pst-exa.tlpobj 2016-04-14 19:36:50.000000000 +0200
+++ new/tlpkg/tlpobj/pst-exa.tlpobj 2017-04-14 17:55:17.000000000 +0200
@@ -10,7 +10,7 @@
RELOC/tex/latex/pst-exa/pst-exa.sty
catalogue-also showexpl
catalogue-ctan /graphics/pstricks/contrib/pst-exa
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics listing pstricks
catalogue-version 0.05
++++++ pst-fill.doc.tar.xz ++++++
++++++ pst-fill.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-fill.tlpobj new/tlpkg/tlpobj/pst-fill.tlpobj
--- old/tlpkg/tlpobj/pst-fill.tlpobj 2016-04-14 19:36:51.000000000 +0200
+++ new/tlpkg/tlpobj/pst-fill.tlpobj 2017-04-14 17:55:17.000000000 +0200
@@ -9,7 +9,7 @@
RELOC/tex/generic/pst-fill/pst-fill.tex
RELOC/tex/latex/pst-fill/pst-fill.sty
catalogue-ctan /graphics/pstricks/contrib/pst-fill
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics graphics-fill-tile pstricks
catalogue-version 1.01
++++++ pst-fit.doc.tar.xz ++++++
++++++ pst-fit.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-fit.tlpobj new/tlpkg/tlpobj/pst-fit.tlpobj
--- old/tlpkg/tlpobj/pst-fit.tlpobj 2016-04-14 19:36:52.000000000 +0200
+++ new/tlpkg/tlpobj/pst-fit.tlpobj 2017-04-14 17:55:17.000000000 +0200
@@ -10,7 +10,7 @@
RELOC/tex/generic/pst-fit/pst-fit.tex
RELOC/tex/latex/pst-fit/pst-fit.sty
catalogue-ctan /graphics/pstricks/contrib/pst-fit
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics graphics-supp
catalogue-version 0.01
++++++ pst-fr3d.doc.tar.xz ++++++
++++++ pst-fr3d.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-fr3d.tlpobj new/tlpkg/tlpobj/pst-fr3d.tlpobj
--- old/tlpkg/tlpobj/pst-fr3d.tlpobj 2016-04-14 19:36:52.000000000 +0200
+++ new/tlpkg/tlpobj/pst-fr3d.tlpobj 2017-04-14 17:55:17.000000000 +0200
@@ -10,7 +10,7 @@
RELOC/tex/generic/pst-fr3d/pst-fr3d.tex
RELOC/tex/latex/pst-fr3d/pst-fr3d.sty
catalogue-ctan /graphics/pstricks/contrib/pst-fr3d
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics boxing graphics-3d pstricks
catalogue-version 1.10
++++++ pst-fractal.doc.tar.xz ++++++
++++++ pst-fractal.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-fractal.tlpobj new/tlpkg/tlpobj/pst-fractal.tlpobj
--- old/tlpkg/tlpobj/pst-fractal.tlpobj 2016-04-14 19:36:52.000000000 +0200
+++ new/tlpkg/tlpobj/pst-fractal.tlpobj 2017-04-14 17:55:17.000000000 +0200
@@ -14,7 +14,7 @@
RELOC/tex/generic/pst-fractal/pst-fractal.tex
RELOC/tex/latex/pst-fractal/pst-fractal.sty
catalogue-ctan /graphics/pstricks/contrib/pst-fractal
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics graphics-use pstricks
catalogue-version 0.06
++++++ pst-fun.doc.tar.xz ++++++
++++++ pst-fun.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-fun.tlpobj new/tlpkg/tlpobj/pst-fun.tlpobj
--- old/tlpkg/tlpobj/pst-fun.tlpobj 2016-04-14 19:36:53.000000000 +0200
+++ new/tlpkg/tlpobj/pst-fun.tlpobj 2017-04-14 17:55:18.000000000 +0200
@@ -12,7 +12,7 @@
RELOC/tex/generic/pst-fun/pst-fun.tex
RELOC/tex/latex/pst-fun/pst-fun.sty
catalogue-ctan /graphics/pstricks/contrib/pst-fun
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics frivolous pstricks
catalogue-version 0.04
++++++ pst-func.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-func/Changes new/doc/generic/pst-func/Changes
--- old/doc/generic/pst-func/Changes 2016-05-02 03:29:35.000000000 +0200
+++ new/doc/generic/pst-func/Changes 2017-04-18 23:31:01.000000000 +0200
@@ -1,4 +1,7 @@
..... pst-func.tex
+0.85 2017-04-18 - allow framing of function values (ts)
+0.84 2017-03-11 - some more modifications to the binomial distributions (ts)
+0.83 2017-03-07 - added some more macros for binomial distributions (ts)
0.82 2016-05-01 - psk@PontName->\psk@func@PointName (same name in pst-eucl)
0.81 2014-05-20 - changed \pstVerb to \pst@Verb in \psZero to allow
variables from tx@Dict
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-func/pst-func-doc.bib new/doc/generic/pst-func/pst-func-doc.bib
--- old/doc/generic/pst-func/pst-func-doc.bib 2013-04-19 01:07:03.000000000 +0200
+++ new/doc/generic/pst-func/pst-func-doc.bib 2017-03-12 23:01:05.000000000 +0100
@@ -14,7 +14,7 @@
@STRING{theatertage = {{\TeX}-Theatertage} }
@Article{ dtk02.2:jackson.voss:plot-funktionen,
- author = {Laura E. Jackson and Herbert Vo{\ss}},
+ author = {Laura E. Jackson and Herbert Voß},
title = {Die {P}lot-{F}unktionen von {\texttt{pst-plot}}},
journal = dtk,
year = 2002,
@@ -34,7 +34,7 @@
}
@Article{ dtk02.1:voss:mathematischen,
- author = {Herbert Vo{\ss}},
+ author = {Herbert Voß},
title = {Die mathematischen {F}unktionen von {P}ost{S}cript},
journal = dtk,
year = 2002,
@@ -48,7 +48,7 @@
abstract = { \PS, faktisch genauso alt wie {\TeX}, ist im
Verh{\"a}ltnis dazu allgemein noch weniger bekannt, wenn es
darum geht zu beurteilen, was es denn nun im eigentlichen
- Sinne ist. Au{\ss}erdem wird h{\"a}ufig vergessen, dass
+ Sinne ist. Außerdem wird h{\"a}ufig vergessen, dass
sich mit den \PS-Funktionen viele Dinge erledigen lassen,
bei denen sonst auf externe Programme zur{\"u}ckgegriffen
wird. Dies wird im Folgenden f{\"u}r die mathematischen
@@ -57,24 +57,15 @@
}
@Book{tlgc2,
- author = {Michel Goosens and Frank Mittelbach and Sebastian Rahtz and Denis Roegel and Herbert Vo{\ss}},
+ author = {Michel Goosens and Frank Mittelbach and Sebastian Rahtz and Denis Roegel and Herbert Voß},
title = {The {\LaTeX} {G}raphics {C}ompanion},
publisher = {{Addison-Wesley Publishing Company}},
- edition = second,
+ edition = 2,
year = {2007},
address = {Reading, Mass.}
}
-@Book{voss:chaos,
- author = {Herbert Vo{\ss}},
- title = {Chaos und {F}raktale selbst programmieren: von {M}andelbrotmengen
- {\"u}ber {F}arbmanipulationen zur perfekten Darstellung},
- publisher = {{Franzis Verlag}},
- year = {1994},
- address = {Poing}
-}
-
@Article{girou:01:,
author = {Denis Girou},
title = {Pr\'esentation de {PST}ricks},
@@ -104,44 +95,41 @@
year = 1989,
}
-@Manual{pstricks,
+@online{pstricks,
Title = {PSTricks - {\PS} macros for generic {\TeX}},
Author = {{Timothy van} Zandt},
Organization = {},
- Address = {\url{http://www.tug.org/application/PSTricks}},
- Note = {},
+ url = {http://www.tug.org/application/PSTricks},
year = 1993
}
-@Manual{pst-plot,
+@ctan{pst-plot,
Title = {\texttt{pst-plot}: Plotting two dimensional functions and data},
- Author = {{Timothy van} Zandt},
+ Author = {{Timothy van} Zandt and Herbert Voß},
Organization = {},
- Address = {\url{CTAN:graphics/pstricks/generic/pst-plot.tex}},
- Note = {},
+ url = {/graphics/pstricks/generic/pst-plot.tex},
year = 1999
}
-@Manual{multido,
+@ctan{multido,
Title = {\texttt{multido.tex} - a loop macro, that supports fixed-point addition},
Author = {{Timothy van} Zandt},
- Organization = {},
- Address = {\url{CTAN:/graphics/pstricks/generic/multido.tex}},
+ url = {/graphics/pstricks/generic/multido.tex},
Note = {},
year = 1997
}
@Book{PSTricks2,
- author = {Herbert Vo\ss},
+ author = {Herbert Voß},
title = {\texttt{PSTricks} -- {G}rafik f\"ur \TeX{} und \LaTeX},
- edition = {6.},
+ edition = {7},
publisher = {DANTE -- Lehmanns},
- year = {2010},
- address = {Heidelberg/Berlin}
+ year = {2016},
+ publisher = {Heidelberg and Berlin}
}
@Book{voss:math,
- author = {Herbert Vo\ss},
+ author = {Herbert Voß},
title = {Typesetting mathematics with \LaTeX},
publisher = {UIT},
year = {2010},
@@ -149,7 +137,7 @@
}
@Book{PSTricks2-UIT,
- author = {Herbert Vo\ss},
+ author = {Herbert Voß},
title = {PSTricks -- Graphics for \TeX\ and \LaTeX},
publisher = {UIT},
year = {2011},
@@ -157,25 +145,24 @@
}
@Book{LaTeXRef-UIT,
- author = {Herbert Vo\ss},
+ author = {Herbert Voß},
title = {{\LaTeX} quick reference},
publisher = {UIT},
year = {2012},
address = {Cambridge}
}
-@Manual{wolfram,
+@online{wolfram,
author = {Eric Weisstein},
title = {Wolfram MathWorld},
publisher = {{Wolfram}},
year = {2007},
- address = {\url{http://mathworld.wolfram.com}}
+ url = {http://mathworld.wolfram.com}
}
-@Manual{pst-tools,
+@ctan{pst-tools,
author = {Herbert Voß},
title = {\texttt{pst-tools} -- Helper functions},
- publisher = {CTAN},
year = {2012},
- address = {\url{CTAN:/graphics/pstricks/contrib/pst-tools}}
+ url = {/graphics/pstricks/contrib/pst-tools}
}
Binary files old/doc/generic/pst-func/pst-func-doc.pdf and new/doc/generic/pst-func/pst-func-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-func/pst-func-doc.tex new/doc/generic/pst-func/pst-func-doc.tex
--- old/doc/generic/pst-func/pst-func-doc.tex 2014-05-21 00:00:54.000000000 +0200
+++ new/doc/generic/pst-func/pst-func-doc.tex 2017-04-18 23:31:01.000000000 +0200
@@ -20,8 +20,22 @@
\psGauss[sigma=1, linecolor=blue, linewidth=2pt]{-1.75}{1.75}
\end{pspicture}}
+\usepackage[style=dtk]{biblatex}
+\addbibresource{pst-func-doc.bib}
+
+
\lstset{language=PSTricks,
- morekeywords={psGammaDist,psChiIIDist,psTDist,psFDist,psBetaDist,psPlotImpl},basicstyle=\footnotesize\ttfamily}
+ morekeywords={psGammaDist,psChiIIDist,psTDist,psFDist,psBetaDist,psPlotImpl},basicstyle=\footnotesize\ttfamily,
+ literate=%
+ {Ö}{{\"O}}1
+ {Ä}{{\"A}}1
+ {Ü}{{\"U}}1
+ {ß}{{\ss}}1
+ {ü}{{\"u}}1
+ {ä}{{\"a}}1
+ {ö}{{\"o}}1
+ {~}{{\textasciitilde}}1
+}
%
\psset{labelFontSize=\scriptstyle}% for mathmode
%\def\pshlabel#1{\footnotesize#1}
@@ -59,6 +73,7 @@
Leon Free,
Attila Gati,
Horst Gierhardt,
+ Jürgen Gilg,
Christophe Jorssen,
Lars Kotthoff,
Buddy Ledger,
@@ -596,7 +611,7 @@
\Lcs{psZero}\OptArgs\Largr{$x_0,x_1$}\Largb{functionA}\OptArg{functionB}\Largb{node name}
\end{BDef}
-If the second function is not given the macro calculates and displays the zeros of
+If the second function is not given the macro calculates and displays the zeros of
the first function. If the second function is defined too, then the macro calculates the
intermediate point of the two functions. The intervall is defined as $[x_0,x_1]$.
Possible optional arguments are
@@ -604,28 +619,69 @@
\medskip
\begin{tabularx}{\linewidth}{ @{} l >{\ttfamily}l X @{} }\toprule
-\emph{Name} & \emph{Default} & \emph{Meaning} \\\midrule
-\Lkeyword{markZeros} & false & Mark the zeros/intermediate points with a symbol.\\
-\Lkeyword{Newton} & false & Use Newton method instead of the bisector one.\\
-\Lkeyword{PrintCoord} & false & Print the pair of coordinate of the zero/intermediate point.\\
-\Lkeyword{onlyNode} & false & Calculate only the node, do not print anything.\\
-\Lkeyword{onlyYVal} & false & Print only the value.\\
-\Lkeyword{originV} & false & Put the values without an offset.\\
-\Lkeyword{PointName} & I & The printed prefix for the calculated Points.\\
-\Lkeyword{decimals} & 2 & The decimals for the $x$ value.\\
-\Lkeyword{ydecimals} & 2 & The decimals for the $y$ value.\\
-\Lkeyword{xShift} & 0 & $x$ move for the printed value.\\
-\Lkeyword{yShift} & 0 & $y$ move for the printed value.\\\bottomrule
+\emph{Name} & \emph{Default} & \emph{Meaning} \\\midrule
+\Lkeyword{markZeros} & false & Mark the zeros/intermediate points with a symbol.\\
+\Lkeyword{Newton} & false & Use Newton method instead of the bisector one.\\
+\Lkeyword{PrintCoord} & false & Print the pair of coordinates of the zero/intermediate point, like $P(x|y)$.\\
+\Lkeyword{onlyNode} & false & Calculate only the node, do not print anything, if markZeros $=$ false.\\
+\Lkeyword{onlyYVal} & false & Print only the $y$-value.\\
+\Lkeyword{xory} & false & Print $x=$ $x$-Value or, if onlyYVal $=$ true, $y=$ $y$-value.\\
+\Lkeyword{approx} & true & Change the $=$, if xory $=$ true to $\approx$.\\
+\Lkeyword{originV} & false & Put the values without an offset.\\
+\Lkeyword{Framed} & false & Show a filled frame in backround, framesep, fillcolor, opacity or
+ linestyle are options to show different frames.\\
+\Lkeyword{PointName} & I & The printed prefix for the calculated Points.\\
+\Lkeyword{decimals} & 2 & The decimals for the $x$ value.\\
+\Lkeyword{ydecimals} & 2 & The decimals for the $y$ value.\\
+\Lkeyword{xShift} & 0 & $x$ move for the printed value.\\
+\Lkeyword{yShift} & 0 & $y$ move for the printed value.\\
+\bottomrule
\end{tabularx}
\medskip
-The following example was done by Thomas Söll.
+The following examples where done by Jürgen Gilg and Thomas Söll.
\bigskip
\definecolor{BeigeTS}{rgb}{0.98,0.95,0.87}
\definecolor{CornBlauTS}{rgb}{0.39,0.59,0.93}
\definecolor{SandBraun}{rgb}{0.96,0.64,0.38}
-\psset{yunit=1.25cm,arrowinset=0.02,arrowlength=2,linewidth=0.5pt,saveNodeCoors,NodeCoorPrefix=n}
+\psset{yunit=1.25cm,arrowinset=0.02,arrowlength=2,linewidth=0.5pt,saveNodeCoors,NodeCoorPrefix=n,comma}
+\def\funkf{2*sqrt(x)*cos(ln(x))*sin(x)}
+\begin{pspicture}[plotpoints=500,algebraic,fontscale=5,markZeros,
+ PointName=N,dotscale=0.7](-0.5,-3)(10,2.5)
+\psStep[fillstyle=solid,fillcolor=BeigeTS,opacity=0.7,linewidth=0.3pt,
+ linecolor=SandBraun!50](0.001,9.5){40}{\funkf}
+\psStep[StepType=Riemann,fillstyle=solid,opacity=0.3,fillcolor=CornBlauTS,
+ linecolor=CornBlauTS,linewidth=0.3pt](0.001,9.5){40}{\funkf}
+\psaxes[labelFontSize=\scriptstyle,ticksize=-0.1 0]{->}(0,0)(0,-2.75)(10,2.5)
+\psplot[linecolor=BeigeTS!60,linewidth=0.8pt]{0.001}{9.75}{\funkf}
+\psplotTangent[linecolor=blue,Derive={Derive(1,\funkf)}]{1.29}{1.5}{\funkf}
+\uput[90](6,1.2){$f(x)=2\cdot\sqrt{x}\cdot\cos{(\ln{x})}\cdot\sin{x}$}
+{\psset{dotscale=1.5,linecolor=blue!50!black!90,ydecimals=0,Framed,opacity=0.8,decimals=1,PrintCoord}
+ \psZero[xShift=-0.2,yShift=0.15,postString=1,Newton](0.5,1){\funkf}{N1}
+ \psZero[xShift=-0.05,yShift=0.15,postString=2](2,4){\funkf}{N2}
+ \psZero[xShift=-0.45,yShift=0.15,postString=3](4,6){\funkf}{N3}
+ \psZero[xShift=-0.45,yShift=0.15,postString=4](6,7){\funkf}{N4}
+ \psZero[xShift=-0.25,yShift=0.15,PointName=x,postString=5,xory,PrintCoord=false,linestyle=none,fillcolor=green,opacity=0.6](9,11){\funkf}{N5}
+ \psZero[xShift=-0.95,yShift=0,PointName=M,decimals=0,linestyle=none,fillcolor=SandBraun,
+ ydecimals=1,opacity=0.8,postString={m=1}](0.5,2){Derive(1,\funkf)-1+\funkf}[\funkf]{M}%
+}
+\pcline{->}(0.5,-1)(M)
+\nbput[nrot=:U,labelsep=0.3,npos=0.2]{%
+ \scriptsize \psZero[originV=true,xory=true,onlyYVal=true,PointName=f(x),postString={m=1},Framed,
+ opacity=0.8,linestyle=none,markZeros=false,fontscale=10](0.5,2){Derive(1,\funkf)-1+\funkf}[\funkf]{R}}
+\psdot[linecolor=green,strokeopacity=0.8](M)
+\uput{0.5}[40](M){\psZero[originV=true,approx=false,xory=true,onlyYVal=true,
+ PointName=m,postString={m=1},markZeros=false,fontscale=8](0.5,2){Derive(1,\funkf)-1}[1]{R}}
+\end{pspicture}
+
+
+%\begin{LTXexample}[pos=t]
+\begin{lstlisting}
+\definecolor{BeigeTS}{rgb}{0.98,0.95,0.87}
+\definecolor{CornBlauTS}{rgb}{0.39,0.59,0.93}
+\definecolor{SandBraun}{rgb}{0.96,0.64,0.38}
+\psset{yunit=1.25cm,arrowinset=0.02,arrowlength=2,linewidth=0.5pt,saveNodeCoors,NodeCoorPrefix=n,comma}
\def\funkf{2*sqrt(x)*cos(ln(x))*sin(x)}
\begin{pspicture}[plotpoints=500,algebraic,fontscale=5,markZeros,PrintCoord,
PointName=N,dotscale=0.7](-0.5,-3)(10,2.5)
@@ -637,23 +693,225 @@
\psplot[linecolor=BeigeTS!60,linewidth=0.8pt]{0.001}{9.75}{\funkf}
\psplotTangent[linecolor=blue,Derive={Derive(1,\funkf)}]{1.29}{1.5}{\funkf}
\uput[90](6,1.2){$f(x)=2\cdot\sqrt{x}\cdot\cos{(\ln{x})}\cdot\sin{x}$}
-{\psset{dotscale=1.5,linecolor=blue!50!black!90,ydecimals=0}
+{\psset{dotscale=1.5,linecolor=blue!50!black!90,ydecimals=0,Framed,opacity=0.8,decimals=1}
\psZero[xShift=-0.2,yShift=0.15,postString=1,Newton](0.5,1){\funkf}{N1}
\psZero[xShift=-0.05,yShift=0.15,postString=2](2,4){\funkf}{N2}
\psZero[xShift=-0.45,yShift=0.15,postString=3](4,6){\funkf}{N3}
\psZero[xShift=-0.45,yShift=0.15,postString=4](6,7){\funkf}{N4}
\psZero[xShift=-0.45,yShift=0.15,postString=5](9,11){\funkf}{N5}
- \psZero[xShift=-1.15,yShift=0,PointName=M,
- postString={m=1}](0.5,2){Derive(1,\funkf)-1+\funkf}[\funkf]{M}%
+ \psZero[xShift=-1.15,yShift=0,PointName=M,decimals=0,linestyle=none,fillcolor=SandBraun,
+ opacity=0.8,postString={m=1}](0.5,2){Derive(1,\funkf)-1+\funkf}[\funkf]{M}%
}
\pcline{->}(0.5,-1)(M)
\nbput[nrot=:U,labelsep=0.01]{%
- \scriptsize Steigung ist hier
+ \scriptsize Steigung ist hier\phantom{i}
\psPrintValueNew[PSfont=Palatino-Roman,decimals=0,round,fontscale=7]{nMx,{Derive(1,\funkf)}}}
\psdot[linecolor=green,strokeopacity=0.8](*{nMx} {\funkf})
-\uput[90](*{nMx} {\funkf}){$m=$
+\uput[90](*{nMx} {\funkf}){$m=$
\psPrintValueNew[PSfont=Palatino-Roman,decimals=0,round,fontscale=8]{nMx,{Derive(1,\funkf)}}}
\end{pspicture}
+\end{lstlisting}
+%\end{LTXexample}
+
+{\psset{yunit=0.8,comma,decimals=2,algebraic=true,markZeros=true,plotpoints=500,saveNodeCoors,NodeCoorPrefix=n}
+%----------------- FUNKTIONSDEFINITIONEN in "algebraic" -----------------
+\def\funkf{0.75*x^4-3*x^2-2}
+\def\funkg{0.25*x+1}
+
+\begin{pspicture}(-6.5,-5.5)(6.5,8.5)
+%------ Gitter im Hintergrund (CLIPPED) -----------------
+\begin{psclip}%
+{\psframe[linestyle=none](-6.4,-5.4)(6.4,7.4)}
+\psgrid[subgriddiv=2,gridlabels=0,gridwidth=0.3pt,gridcolor=black!50,subgridwidth=0.2pt,subgridcolor=black!30](-6.5,-7.5)(6.5,8.5)
+\end{psclip}
+%--------- Achsen ------------
+\psaxes[xDecimals=0, yDecimals=0,labelFontSize=\scriptstyle,arrowscale=1.3,arrowinset=0.05,arrowlength=1.9, Dy=1,dy=1,dx=1,Dx=1,subticks=0,comma,tickwidth=0.5pt]{->}(0,0)(-6.5,-5.5)(6.5,7.5)[$x$,-90][$y$,180]% Achsen
+%----- Funktionsgraphen plotten (Clippen, damit sie nicht aus dem Gitter ragen) -----------------
+\begin{psclip}%
+{\psframe[linestyle=none](-6.5,-5.4)(6.5,7.4)}
+\psplot[linewidth=1pt,linecolor=Gray]{-6.5}{6.5}{\funkf}%
+\psplot[linewidth=1pt,linecolor=BrickRed]{-6.5}{6.5}{\funkg}%
+\end{psclip}
+%----------------- SPEZIELLE PUNKTE -----------------
+{\psset{fontscale=8,PrintCoord=true,linestyle=none,opacity=0.8,Framed=true,fillcolor=cyan!10}
+%----------------- NULLSTELLEN -----------------
+\psZero[xShift=-0.9,yShift=0.15,PointName={N},postString={1},ydecimals=0](-3,-2){\funkf}[0]{N1}
+\psZero[xShift=-0.9,yShift=0.15,PointName={N},postString={2},ydecimals=0](2,3){\funkf}[0]{N2}
+%----------------- EXTREMWERTE -----------------
+\psZero[xShift=-0.9,yShift=-0.25,PointName={T},postString={1}](-2,0){Derive(1,\funkf)+\funkf}[\funkf]{T1}
+\psZero[xShift=-0.9,yShift=0.25,PointName={H},postString={}](-1,1){Derive(1,\funkf)+\funkf}[\funkf]{H}
+\psZero[xShift=-0.9,yShift=-0.25,PointName={T},postString={2}](0,2.5){Derive(1,\funkf)+\funkf}[\funkf]{T2}
+%----------------- WENDEPUNKTE -----------------
+\psZero[xShift=-1.2,yShift=-0.25,PointName={W},postString={1}](-1.5,-0.5){Derive(2,\funkf)+\funkf}[\funkf]{W1}
+\psZero[xShift=-0.6,yShift=-0.25,PointName={W},postString={2}](0.5,1.5){Derive(2,\funkf)+\funkf}[\funkf]{W2}
+\psZero[onlyNode=true,markZeros=false](-1.5,-0.5){Derive(2,\funkf)+Derive(1,\funkf)}[Derive(1,\funkf)]{mW1}%Steigung Wendepunkt 1 ist "nmW1y"
+}
+%----------------- GLEICHUNG WENDETANGENTE -----------------
+\def\funkWende{nmW1y*(x-nW1x)+nW1y}
+%----------------- GLEICHUNG WENDENORMALE -----------------
+\def\funkNormal{-1/nmW1y*(x-nW1x)+nW1y} %m_n=-1/m_t
+%----------------- Tangente und Normale in W1 plotten ------------------
+\psplot[linewidth=1pt,linecolor=blue]{-1.3}{2.55}{\funkWende}%
+\psplot[linewidth=1pt,linecolor=Green]{-6.5}{5}{\funkNormal}%
+%----------------- Punkte und Werte NICHT anzeigen
+{\psset{onlyNode=true,markZeros=false}
+%----------------- Schnittpunkt: Wendetangente in W1 mit f -------------
+\psZero(0,4){\funkWende}[\funkf]{WS1}
+%----------------- Schnittpunkte: Wendenormale in W1 mit f -------------
+\psZero(-4,0){\funkNormal}[\funkf]{WN1}
+\psZero(0,1.5){\funkNormal}[\funkf]{WN2}
+\psZero(1.5,3){\funkNormal}[\funkf]{WN3}
+%----------------- NULLSTELLE von g -----------------
+\psZero(-3,3){\funkg}[0]{Ng1}
+%----------------- SCHNITTPUNKTE f und g -----------------
+\psZero(0,3){\funkg}[\funkf]{S1}
+\psZero(-3,0){\funkg}[\funkf]{S2}
+}
+%----------------- FLÄCHE mit x-ACHSE -----------------
+\pscustom[fillstyle=solid,opacity=0.3,fillcolor=gray,linestyle=none]{%
+\psplot{nN1x}{nW1x}{\funkf}
+\lineto(!nW1x 0)
+\closepath
+}
+%----------------- FLÄCHE ZWISCHEN WENDETANGENTE UND KURVE f -----------------
+\pscustom[fillstyle=solid,opacity=0.3,fillcolor=blue,linestyle=none]{%
+\psplot{nW1x}{nWS1x}{\funkWende}
+\psplot{nWS1x}{nW1x}{\funkf}
+\closepath
+}
+%----------------- FLÄCHE ZWISCHEN WENDENORMALE UND KURVE f (Zwei FlÄchenstücke!!!) ----
+%----------------- linke FLÄCHE -----------------
+\pscustom[fillstyle=solid,opacity=0.3,fillcolor=green,linestyle=none]{%
+\psplot{nWN1x}{nW1x}{\funkNormal}
+\psplot{nW1x}{nWN1x}{\funkf}
+\closepath
+}
+%----------------- rechte FLÄCHE -----------------
+\pscustom[fillstyle=solid,opacity=0.3,fillcolor=green,linestyle=none]{%
+\psplot{nWN2x}{nWN3x}{\funkNormal}
+\psplot{nWN3x}{nWN2x}{\funkf}
+\closepath
+}
+%----------------- FLÄCHE zwischen den KURVEN f und g und beiden KOORDINATEN-ACHSEN -----
+\pscustom[fillstyle=solid,opacity=0.3,fillcolor=yellow,linestyle=none]{%
+\psplot{0}{nS1x}{\funkg}
+\psplot{nS1x}{nN2x}{\funkf}
+\lineto(0,0)
+\closepath
+}
+% SPIELEREI: FLÄCHE mit f und PARALLELEN ZUR x-ACHSE
+% Punkte und Werte NICHT anzeigen
+{\psset{onlyNode=true,markZeros=false}
+\psZero(-3,-2){\funkf}[2]{M1}
+\psZero(-3,-2){\funkf}[4]{M2}
+}
+\pscustom[fillstyle=solid,opacity=0.3,fillcolor=magenta,linestyle=none]{%
+\psplot{nM1x}{nM2x}{\funkf}
+\lineto(0,4)
+\lineto(0,2)
+\closepath
+}
+\end{pspicture}}
+
+\begin{lstlisting}
+\psset{yunit=0.8,comma,decimals=2,algebraic=true,markZeros=true,plotpoints=500,saveNodeCoors,NodeCoorPrefix=n}
+%----------------- FUNKTIONSDEFINITIONEN in "algebraic" -----------------
+\def\funkf{0.75*x^4-3*x^2-2}
+\def\funkg{0.25*x+1}
+
+\begin{pspicture}(-6.5,-5.5)(6.5,8.5)
+%------ Gitter im Hintergrund (CLIPPED) -----------------
+\begin{psclip}%
+{\psframe[linestyle=none](-6.4,-5.4)(6.4,7.4)}
+\psgrid[subgriddiv=2,gridlabels=0,gridwidth=0.3pt,gridcolor=black!50,subgridwidth=0.2pt,subgridcolor=black!30](-6.5,-7.5)(6.5,8.5)
+\end{psclip}
+%--------- Achsen ------------
+\psaxes[xDecimals=0, yDecimals=0,labelFontSize=\scriptstyle,arrowscale=1.3,arrowinset=0.05,arrowlength=1.9, Dy=1,dy=1,dx=1,Dx=1,subticks=0,comma,tickwidth=0.5pt]{->}(0,0)(-6.5,-5.5)(6.5,7.5)[$x$,-90][$y$,180]% Achsen
+%----- Funktionsgraphen plotten (Clippen, damit sie nicht aus dem Gitter ragen) -----------------
+\begin{psclip}%
+{\psframe[linestyle=none](-6.5,-5.4)(6.5,7.4)}
+\psplot[linewidth=1pt,linecolor=Gray]{-6.5}{6.5}{\funkf}%
+\psplot[linewidth=1pt,linecolor=BrickRed]{-6.5}{6.5}{\funkg}%
+\end{psclip}
+%----------------- SPEZIELLE PUNKTE -----------------
+{\psset{fontscale=8,PrintCoord=true,linestyle=none,opacity=0.8,Framed=true,fillcolor=cyan!10}
+%----------------- NULLSTELLEN -----------------
+\psZero[xShift=-0.9,yShift=0.15,PointName={N},postString={1},ydecimals=0](-3,-2){\funkf}[0]{N1}
+\psZero[xShift=-0.9,yShift=0.15,PointName={N},postString={2},ydecimals=0](2,3){\funkf}[0]{N2}
+%----------------- EXTREMWERTE -----------------
+\psZero[xShift=-0.9,yShift=-0.25,PointName={T},postString={1}](-2,0){Derive(1,\funkf)+\funkf}[\funkf]{T1}
+\psZero[xShift=-0.9,yShift=0.25,PointName={H},postString={}](-1,1){Derive(1,\funkf)+\funkf}[\funkf]{H}
+\psZero[xShift=-0.9,yShift=-0.25,PointName={T},postString={2}](0,2.5){Derive(1,\funkf)+\funkf}[\funkf]{T2}
+%----------------- WENDEPUNKTE -----------------
+\psZero[xShift=-1.2,yShift=-0.25,PointName={W},postString={1}](-1.5,-0.5){Derive(2,\funkf)+\funkf}[\funkf]{W1}
+\psZero[xShift=-0.6,yShift=-0.25,PointName={W},postString={2}](0.5,1.5){Derive(2,\funkf)+\funkf}[\funkf]{W2}
+\psZero[onlyNode=true,markZeros=false](-1.5,-0.5){Derive(2,\funkf)+Derive(1,\funkf)}[Derive(1,\funkf)]{mW1}%Steigung Wendepunkt 1 ist "nmW1y"
+}
+%----------------- GLEICHUNG WENDETANGENTE -----------------
+\def\funkWende{nmW1y*(x-nW1x)+nW1y}
+%----------------- GLEICHUNG WENDETANGENTE -----------------
+\def\funkNormal{-1/nmW1y*(x-nW1x)+nW1y} %m_n=-1/m_t
+%----------------- Tangente und Normale in W1 plotten ------------------
+\psplot[linewidth=1pt,linecolor=blue]{-1.3}{2.55}{\funkWende}%
+\psplot[linewidth=1pt,linecolor=Green]{-6.5}{5}{\funkNormal}%
+%----------------- Punkte und Werte NICHT anzeigen
+{\psset{onlyNode=true,markZeros=false}
+%----------------- Schnittpunkt: Wendetangente in W1 mit f -------------
+\psZero(0,4){\funkWende}[\funkf]{WS1}
+%----------------- Schnittpunkte: Wendenormale in W1 mit f -------------
+\psZero(-4,0){\funkNormal}[\funkf]{WN1}
+\psZero(0,1.5){\funkNormal}[\funkf]{WN2}
+\psZero(1.5,3){\funkNormal}[\funkf]{WN3}
+%----------------- NULLSTELLE von g -----------------
+\psZero(-3,3){\funkg}[0]{Ng1}
+%----------------- SCHNITTPUNKTE f und g -----------------
+\psZero(0,3){\funkg}[\funkf]{S1}
+\psZero(-3,0){\funkg}[\funkf]{S2}
+}
+%----------------- FLÄCHE mit x-ACHSE -----------------
+\pscustom[fillstyle=solid,opacity=0.3,fillcolor=gray,linestyle=none]{%
+\psplot{nN1x}{nW1x}{\funkf}
+\lineto(!nW1x 0)
+\closepath
+}
+%----------------- FLÄCHE ZWISCHEN WENDETANGENTE UND KURVE f -----------------
+\pscustom[fillstyle=solid,opacity=0.3,fillcolor=blue,linestyle=none]{%
+\psplot{nW1x}{nWS1x}{\funkWende}
+\psplot{nWS1x}{nW1x}{\funkf}
+\closepath
+}
+%----------------- FLÄCHE ZWISCHEN WENDENORMALE UND KURVE f (Zwei FlÄchenstücke!!!) ----
+%----------------- linke FLÄCHE -----------------
+\pscustom[fillstyle=solid,opacity=0.3,fillcolor=green,linestyle=none]{%
+\psplot{nWN1x}{nW1x}{\funkNormal}
+\psplot{nW1x}{nWN1x}{\funkf}
+\closepath
+}
+%----------------- rechte FLÄCHE -----------------
+\pscustom[fillstyle=solid,opacity=0.3,fillcolor=green,linestyle=none]{%
+\psplot{nWN2x}{nWN3x}{\funkNormal}
+\psplot{nWN3x}{nWN2x}{\funkf}
+\closepath
+}
+%----------------- FLÄCHE zwischen den KURVEN f und g und beiden KOORDINATEN-ACHSEN -----
+\pscustom[fillstyle=solid,opacity=0.3,fillcolor=yellow,linestyle=none]{%
+ \psplot{0}{nS1x}{\funkg}
+ \psplot{nS1x}{nN2x}{\funkf}
+ \lineto(0,0)
+ \closepath}
+% SPIELEREI: FLÄCHE mit f und PARALLELEN ZUR x-ACHSE
+% Punkte und Werte NICHT anzeigen
+{\psset{onlyNode=true,markZeros=false}
+\psZero(-3,-2){\funkf}[2]{M1}
+\psZero(-3,-2){\funkf}[4]{M2}}
+\pscustom[fillstyle=solid,opacity=0.3,fillcolor=magenta,linestyle=none]{%
+ \psplot{nM1x}{nM2x}{\funkf}
+ \lineto(0,4)
+ \lineto(0,2)
+ \closepath}
+\end{pspicture}
+\end{lstlisting}
+
%\begin{LTXexample}[pos=t]
@@ -1032,38 +1290,47 @@
\clearpage
+
+
+
\subsection{Binomial distribution}\label{sec:bindistri}
-These two macros plot binomial distribution, \Lcs{psBinomialN} the normalized one.
-It is always done in the $x$-Intervall $[0;1]$.
-Rescaling to another one can be done by setting the \Lkeyword{xunit} option
-to any other value.
-
-The binomial distribution gives the discrete probability distribution $P_p(n|N)$ of obtaining
-exactly $n$ successes out of $N$ Bernoulli trials (where the result of each
-Bernoulli trial is true with probability $p$ and false with probability
-$q=1-p$. The binomial distribution is therefore given by
+\begin{sloppypar}
+The following five macros plot binomial probability mass function \Lcs{psBinomial} and \Lcs{psBinomialC} in curve style, the normalized one is \Lcs{psBinomialN}. The cumulative distribution function $F$ \Lcs{psBinomialF} and the complement of the cumulative distribution function ($1-F$) \Lcs{psBinomialFS}
+The vertical range for the plots is the $y$-Intervall $[0;1]$.
+Rescaling other values can be done by setting the \Lkeyword{yunit} option
+to any other value.
+\end{sloppypar}
+
+The binomial distribution \Lcs{psBinomial} gives the discrete probability distribution $P_p(n|N)$ $n$ successes out of $N$ Bernoulli trials (where the result of each Bernoulli trial is true with probability $p$ and false with probability $q=1-p$). The binomial distribution is therefore given by
\begin{align}
P_p(n|N) &= \binom{N}{n}p^nq^{N-n} \\
&= \frac{N!}{n!(N-n)!}p^n(1-p)^{N-n},
\end{align}
-where $(N; n)$ is a binomial coefficient and $P$ the probability.
+where $(N; n)$ is a binomial coefficient and $P$ the probability.
-The syntax is quite easy:
+The syntax is:
\begin{BDef}
\Lcs{psBinomial}\OptArgs\Largb{N}\Largb{probability p}\\
\Lcs{psBinomial}\OptArgs\Largb{m,N}\Largb{probability p}\\
\Lcs{psBinomial}\OptArgs\Largb{m,n,N}\Largb{probability p}\\
-\Lcs{psBinomialN}\OptArgs\Largb{N}\Largb{probability p}
+\Lcs{psBinomialC}\OptArgs\Largb{N}\Largb{probability p}\\
+\Lcs{psBinomialN}\OptArgs\Largb{N}\Largb{probability p}\\
+\Lcs{psBinomialF}\OptArgs\Largb{N}\Largb{probability p}\\
+\Lcs{psBinomialF}\OptArgs\Largb{m,N}\Largb{probability p}\\
+\Lcs{psBinomialF}\OptArgs\Largb{m,n,N}\Largb{probability p}\\
+\Lcs{psBinomialFS}\OptArgs\Largb{N}\Largb{probability p}\\
+\Lcs{psBinomialFS}\OptArgs\Largb{m,N}\Largb{probability p}\\
+\Lcs{psBinomialFS}\OptArgs\Largb{m,n,N}\Largb{probability p}
\end{BDef}
\begin{itemize}
\item with one argument $N$ the sequence $0\ldots N$ is calculated and plotted
-\item with two arguments $m,N$ the sequence $0\ldots N$ is calculated and
+\item with two arguments $m,N$ the sequence $0\ldots N$ is calculated and
the sequence $m\ldots N$ is plotted
-\item with three arguments $m,n,N$ the sequence $0\ldots N$ is calculated and
+\item with three arguments $m,n,N$ the sequence $0\ldots N$ is calculated and
the sequence $m\ldots n$ is plotted
\end{itemize}
@@ -1071,23 +1338,38 @@
one should expect problems with $N>100$. PostScript cannot handle such small values and there will
be no graph printed. This happens on PostScript side, so \TeX\ doesn't report any problem in
the log file. The valid options for the macros are \Lkeyword{markZeros} to draw rectangles instead
-of a continous line and \Lkeyword{printValue} for printing the $y$-values on top of the lines,
-rotated by 90\textdegree. For this option all other options from section~1
-for the macro \Lcs{psPrintValue} are valid, too.~ \cite{pst-tools} Important is the keyword \Lkeyword{valuewidth}
+of a continous line and \Lkeyword{printValue} for printing the $y$-values in the color LabelColor $=$ color on top of the lines in distance labelsep and xlabelsep, rotated by labelangle $=\alpha$. For this option all other options from section~1
+for the macro \Lcs{psPrintValue} are valid, too.~ \cite{pst-tools} Important is the keyword \Lkeyword{valuewidth}
which is preset to 10. If your value has more characters when converting into a string, it will
not be printed or cause an GhostScript error.
-The only special option is \Lkeyword{barwidth},
-which is a factor (no dimension) and set by default to 1. This option is only valid for
-the macro \Lcs{psBinomial} and not for the normalized one!
+Special options are
+\begin{itemize}
+\item \Lkeyword{barwidth}, which is a factor (no dimension) and set by default to 1. This option is not valid for
+the macro \Lcs{psBinomialN}!
+\item \Lkeyword{labelangle} is the rotation of the printed values, default is 90\textdegree
+\item \Lkeyword{xlabelsep} is the x-separation of the printed values, default is 0 (no dimension)
+\item \Lkeyword{labelsep} is the y-separation of the printed values, default is 0.2 (no dimension)
+\item \Lkeyword{LabelColor} is the color of the printed values, default is black
+\item \Lkeyword{LineEnding} this boolean is only valid for the macros \Lcs{psBinomialF} and \Lcs{psBinomialFS}, default is true. Draws circles at the end of the lines
+\item \Lkeyword{VLines} this option is only valid for the macros \Lcs{psBinomialF} and \Lcs{psBinomialFS}, default is false. Draws the vertical lines dashed.
+\item \Lkeyword{rightEnd}, this option is only valid for the macros \Lcs{psBinomialF} and \Lcs{psBinomialFS} when LineEnding=true (default) and $n=N$, default is 2
+\item \Lkeyword{leftEnd}, this option is only valid for the macros \Lcs{psBinomialF} and \Lcs{psBinomialFS} when LineEnding=true (default) and $m=0$, default is 1
+\item \Lkeyword{radiusout}, this option is only valid for the macros \Lcs{psBinomialF} and \Lcs{psBinomialFS} when LineEnding=true (default) for the outer radius of the both dots left and right, default is 2
+\item \Lkeyword{radiusinL}, this option is only valid for the macros \Lcs{psBinomialF} and \Lcs{psBinomialFS} when LineEnding=true (default) for the inner radius of the left dot, default is 0
+\item \Lkeyword{radiusinR}, this option is only valid for the macros \Lcs{psBinomialF} and \Lcs{psBinomialFS} when LineEnding=true (default) for the inner radius of the right dot, default is 1.5
+\item \Lkeyword{LineEndColorL} this option is only valid for the macros \Lcs{psBinomialF} and \Lcs{psBinomialFS} when LineEnding=true (default) for the color of the left dot, default is green
+\item \Lkeyword{LineEndColorR} this option is only valid for the macros \Lcs{psBinomialF} and \Lcs{psBinomialFS} when LineEnding=true (default) for the inner radius of the right dot, default is red
+\end{itemize}
\psset[pst-func]{barwidth=1}
\begin{LTXexample}[pos=t,preset=\centering]
\psset{xunit=1cm,yunit=5cm}%
-\begin{pspicture}(-1,-0.15)(7,0.55)%
+\begin{pspicture}(-1,-0.15)(7,0.6)%
\psaxes[Dy=0.2,dy=0.2\psyunit]{->}(0,0)(-1,0)(7,0.5)
\uput[-90](7,0){$k$} \uput[90](0,0.5){$P(X=k)$}
-\psBinomial[markZeros,printValue,fillstyle=vlines]{6}{0.4}
+\psBinomial[markZeros,printValue,fillstyle=vlines,
+labelangle=80,LabelColor=blue]{6}{0.4}
\end{pspicture}
\end{LTXexample}
@@ -1096,8 +1378,9 @@
\begin{pspicture}(-1,-0.05)(8,0.6)%
\psaxes[Dy=0.2,dy=0.2\psyunit]{->}(0,0)(-1,0)(8,0.5)
\uput[-90](8,0){$k$} \uput[90](0,0.5){$P(X=k)$}
+\psBinomialC[fillstyle=solid,opacity=0.5,fillcolor=cyan,plotstyle=curve]{7}{0.6}
\psBinomial[linecolor=red,markZeros,printValue,fillstyle=solid,
- fillcolor=blue,barwidth=0.2]{7}{0.6}
+ fillcolor=blue,barwidth=0.2,xlabelsep=-0.05]{7}{0.6}
\end{pspicture}
\end{LTXexample}
@@ -1109,6 +1392,7 @@
\psBinomial[linecolor=black!30]{0,7}{0.6}
\psBinomial[linecolor=blue,markZeros,printValue,fillstyle=solid,
fillcolor=blue,barwidth=0.4]{2,5,7}{0.6}
+\psBinomialC[,showpoints=true,plotstyle=curve]{7}{0.6}
\end{pspicture}
\end{LTXexample}
@@ -1125,6 +1409,35 @@
\end{pspicture*}
\end{LTXexample}
+\begin{LTXexample}[pos=t,preset=\centering]
+\psset{xunit=0.8cm,yunit=8cm}%
+\begin{pspicture*}[showgrid=false](-1.5,-0.1)(16,1.2)%
+\psset{arrowscale=1.3,arrowinset=0.05,arrowlength=1.9,comma}%
+\psaxes[labelFontSize=\scriptstyle,xticksize=0 1.07,yticksize=0 16,tickcolor=gray!50,
+ Dy=0.1,dy=0.1,Dx=1,dx=1,Ox=0]{->}(0,0)(-0.9,0)(16,1.1)
+\uput[-90](15.8,0){$z$}\uput[0](0,1.1){$P_{0,15}^{100}(Z=z)$}
+\psBinomialC[linecolor=cyan,fillstyle=solid,fillcolor=cyan!50,opacity=0.4,plotstyle=curve]{40}{0.15}%
+\psBinomial[markZeros,linecolor=BrickRed,fillstyle=solid,fillcolor=BrickRed,barwidth=0.75,opacity=0.6]{1,16,40}{0.15}%
+\psBinomialFS[markZeros,linecolor=Green,fillstyle=solid,fillcolor=orange,barwidth=0.3,opacity=0.6]{0,16,40}{0.15}%
+\psBinomialF[linecolor=gray,fillstyle=solid,fillcolor=yellow,barwidth=0.4,opacity=0.5]{3,16,40}{0.15}
+\end{pspicture*}
+\end{LTXexample}
+
+\begin{LTXexample}[pos=t,preset=\centering]
+\psset{xunit=0.75cm,yunit=7.5cm}%
+\begin{pspicture*}[showgrid=false](-1.3,-0.067)(14.67,1.13)%
+\psset{arrowscale=1.3,arrowinset=0.05,arrowlength=1.9,comma}
+\psaxes[labelFontSize=\scriptstyle,xticksize=0 1.07,yticksize=0 12,tickcolor=gray!50,Dy=0.1,dy=0.1,Dx=1,dx=1,Ox=0]{->}(0,0)(-0.9,0)(14,1.1)
+\uput[-90](13.8,0){$z$} \uput[0](0,1.08){$F_{0,7}^{10}(Z\leq z)$}
+\psBinomial[markZeros,linecolor=orange,fillstyle=solid,fillcolor=orange,barwidth=1,opacity=0.5]{0,10,10}{0.7}
+\psBinomialF[markZeros,linecolor=blue,linewidth=0.7pt,barwidth=0.2,
+opacity=0.5,fillstyle=solid,fillcolor=blue,valuewidth=15]{0,13,10}{0.7}
+\psBinomialFS[LineEnding=false,linecolor=BrickRed,linewidth=0.9pt,VLines=true]{0,10,10}{0.7}
+\psBinomialF[linecolor=Green,printValue=false,linewidth=1.2pt,LineEndColorR=BrickRed,LineEndColorL=Green!70,
+radiusout=3.5,radiusinL=0,radiusinR=2,LineEnding=true,leftEnd=1,rightEnd=3]{0,10,10}{0.7}
+\end{pspicture*}
+\end{LTXexample}
+
The default binomial distribution has the mean of $\mu=E(X)=N\cdot p$
and a variant of $\sigma^2=\mu\cdot(1-p)$.
The normalized distribution has a mean of $0$. Instead of $P(X=k)$
@@ -1166,7 +1479,7 @@
\end{pspicture*}
\end{LTXexample}
-For the normalized distribution the plotstyle can be set to \Lkeyval{curve} (\Lkeyset{plotstyle=curve}),
+For the normalized distribution the plotstyle can be set to \Lkeyval{curve} (\Lkeyset{plotstyle=curve}),
then the binomial distribution looks like a normal distribution. This option is only
valid for \Lcs{psBinomialN}. The option \Lkeyword{showpoints} is valid if \Lkeyval{curve} was chosen.
@@ -1190,6 +1503,12 @@
\end{pspicture*}
\end{LTXexample}
+
+
+
+
+
+
\clearpage
\subsection{Poisson distribution}
Given a Poisson process\footnote{\url{http://mathworld.wolfram.com/PoissonProcess.html}},
@@ -1776,7 +2095,7 @@
\clearpage
\section{\nxLcs{psplotImp} -- plotting implicit defined functions}
For a given area, the macro calculates in a first step row by row for every pixel (1pt)
-the function $f(x,y)$ and checks for avchanging of the value from $f(x,y)<0$ to $f(x,y)>0$
+the function $f(x,y)$ and checks for a changing of the value from $f(x,y)<0$ to $f(x,y)>0$
or vice versa. If this happens, then the pixel must be part of the curve of
the function $f(x,y)=0$. In a second step the same is done column by column.
This may take some time because an area of $400\times 300$ pixel needs 120 thousand calculations
@@ -2111,10 +2430,10 @@
\xkvview{family=pst-func,columns={key,type,default}}
\bgroup
-\raggedright
+\RaggedRight
\nocite{*}
-\bibliographystyle{plain}
-\bibliography{pst-func-doc}
+%\bibliographystyle{plain}
+\printbibliography{pst-func-doc}
\egroup
\printindex
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-func.doc.tlpobj new/tlpkg/tlpobj/pst-func.doc.tlpobj
--- old/tlpkg/tlpobj/pst-func.doc.tlpobj 2016-05-03 03:18:37.000000000 +0200
+++ new/tlpkg/tlpobj/pst-func.doc.tlpobj 2017-04-19 02:06:48.000000000 +0200
@@ -1,9 +1,9 @@
name pst-func.doc
category Package
-revision 40824
+revision 43912
shortdesc doc files of pst-func
relocated 1
-docfiles size=923
+docfiles size=960
RELOC/doc/generic/pst-func/Changes
RELOC/doc/generic/pst-func/README.md
RELOC/doc/generic/pst-func/pst-func-doc.bib
++++++ pst-func.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/pst-func/pst-func.tex new/tex/generic/pst-func/pst-func.tex
--- old/tex/generic/pst-func/pst-func.tex 2016-05-02 03:29:35.000000000 +0200
+++ new/tex/generic/pst-func/pst-func.tex 2017-04-18 23:31:01.000000000 +0200
@@ -19,7 +19,7 @@
%%
\csname PSTfuncLoaded\endcsname
\let\PSTfuncLoaded\endinput
-% Requires some PSTricks packages
+% Requires some PSTricks packages
\ifx\PSTricksLoaded\endinput\else \input pstricks.tex\fi
\ifx\PSTnodesLoaded\endinput\else \input pst-plot.tex\fi
\ifx\PSTmathLoaded\endinput \else \input pst-math.tex\fi
@@ -31,8 +31,8 @@
% interface to the `xkeyval' package
\pst@addfams{pst-func}
%
-\def\fileversion{0.82}
-\def\filedate{2016/05/01}
+\def\fileversion{0.85}
+\def\filedate{2017/04/18}
\message{`PST-func' v\fileversion, \filedate\space (hv)}
%
\pstheader{pst-func.pro}
@@ -94,7 +94,7 @@
coeff=0 1, % coeff=a0 a1 a2 a3 ...
Derivation=0, % 0 is the original function
markZeros=false,% no dots for the zeros
- epsZero=0.1, % the distance between two zero points
+ epsZero=0.1, % the distance between two zero points
dZero=0.1, % the distance of the x value for scanning the function
zeroLineTo=-1, % a line to the value of the lineTo's Derivation (-1= none)
zeroLineStyle=dashed,%
@@ -139,7 +139,7 @@
y0 % the returned value ist the zero point
0 \tx@ScreenCoor pstack
3 0 360 arc gsave 0 0 1 setrgbcolor fill grestore 1 setlinewidth stroke
-} def
+} def
\fi
%
\def\psPolynomial{\pst@object{psPolynomial}}
@@ -157,7 +157,7 @@
/dx x1 x0 sub \psk@plotpoints\space div def
/Derivation \psk@Derivation\space def
/x x0 def
- \ifPst@markZeros
+ \ifPst@markZeros
5 dict begin % hold all local!
gsave
\pst@number\psk@zeroLineWidth SLW
@@ -168,10 +168,10 @@
xZero \pst@number\psxunit mul /xPixel exch def
\psk@dotsize
\@nameuse{psds@\psk@dotstyle}%
- xPixel 0 Dot
+ xPixel 0 Dot
\psk@zeroLineTo\space 0 ge { % line to function \psk@lineTo
xPixel 0 moveto
- xZero coeff \psk@zeroLineTo\space FuncValue
+ xZero coeff \psk@zeroLineTo\space FuncValue
\pst@number\psyunit mul xPixel exch L
\@nameuse{psls@\psk@zeroLineStyle}
} if
@@ -180,7 +180,7 @@
end
\fi
/xy {
- x \psk@xShift\space sub coeff Derivation FuncValue \pst@number\psyunit mul
+ x \psk@xShift\space sub coeff Derivation FuncValue \pst@number\psyunit mul
x \pst@number\psxunit mul exch
} def
xy moveto
@@ -210,7 +210,7 @@
mark
/n 2 def
\psk@plotpoints {
- xy
+ xy
n 2 roll
/n n 2 add def
/x x dx add def
@@ -257,13 +257,13 @@
\psplot{#2}{#3}[ /nue \psk@nue def /epsilon 1e-20 def ]{%
/Sum 0 def
/Iter 0 def
- {/Sum_Iter
+ {/Sum_Iter
x dup mul 4 div Iter exp % nominator
nue Iter add 1 add GAMMA Iter tx@AddMathFunc begin ! end mul % denominator
Div def
Sum_Iter abs epsilon lt { exit } if
/Sum Sum Sum_Iter add def
- /Iter Iter 1 add def
+ /Iter Iter 1 add def
} loop
x 0.5 mul nue exp Sum mul
}%
@@ -280,7 +280,7 @@
\psset{plotpoints=200}%
\psset{#1}%
\psplot[algebraic=false]{#2}{#3}{%
- Euler x \psk@mue sub dup mul 2 div \psk@sigma dup mul div neg exp
+ Euler x \psk@mue sub dup mul 2 div \psk@sigma dup mul div neg exp
1.0 \psk@sigma div TwoPi sqrt div mul%
}%
}\ignorespaces}
@@ -296,20 +296,20 @@
/a #1 def
/dx #2 #1 sub \psk@plotpoints\space div def
/b a dx add def
- /scx { \pst@number\psxunit mul } def
+ /scx { \pst@number\psxunit mul } def
/scy { \pst@number\psyunit mul } def
- tx@FuncDict begin
+ tx@FuncDict begin
/C 1 \psk@sigma div TwoPi sqrt div def
/SFunc {% x on Stack
- Euler exch \psk@mue\space sub dup mul 2 div \psk@sigma\space dup mul div neg exp C mul
- } def
+ Euler exch \psk@mue\space sub dup mul 2 div \psk@sigma\space dup mul div neg exp C mul
+ } def
end
% a scx 0 moveto
a scx 0 \@nameuse{beginqp@\psplotstyle}
\psk@plotpoints 1 sub {
a b \psk@Simpson % a b M on Stack
tx@FuncDict begin Simpson I end % y value on stack
- scy b scx exch \@nameuse{doqp@\psplotstyle} %lineto
+ scy b scx exch \@nameuse{doqp@\psplotstyle} %lineto
/b b dx add def
} repeat
% stroke
@@ -397,17 +397,17 @@
\def\psPrintValue@i#1{\expandafter\psPrintValue@ii#1,,\@nil}
\def\psPrintValue@ii#1,#2,#3\@nil{% #1,#2 only for algebraic code
\begin@SpecialObj
- \addto@pscode{
- gsave \psk@PSfont findfont \psk@fontscale scalefont setfont
- \ifPst@algebraic
- /x #1 def
- /Func (#2) tx@AlgToPs begin AlgToPs end cvx def
- Func
+ \addto@pscode{
+ gsave \psk@PSfont findfont \psk@fontscale scalefont setfont
+ \ifPst@algebraic
+ /x #1 def
+ /Func (#2) tx@AlgToPs begin AlgToPs end cvx def
+ Func
\else #1 \fi
\psk@decimals -1 gt { 10 \psk@decimals exp dup 3 1 roll mul cvi exch div } if
\psk@valuewidth string cvs %/Output exch def % save output
\ifPst@comma dot2comma \fi % do we have to change dot to comma
- \psk@xShift\space 0 moveto %Output
+ \psk@xShift\space 0 moveto %Output
show grestore
}%
\end@SpecialObj%
@@ -425,20 +425,20 @@
/mfont { \psk@PSfont findfont \psk@fontscale scalefont setfont } bind def
/mfontexp { \psk@PSfont findfont \psk@fontscale 1.2 div scalefont setfont } bind def
/s1 { /Symbol findfont \psk@fontscale scalefont setfont } bind def
- \ifPst@algebraic
+ \ifPst@algebraic
/x #1 def
- /Func (#2) tx@AlgToPs begin AlgToPs end cvx def
- Func
+ /Func (#2) tx@AlgToPs begin AlgToPs end cvx def
+ Func
\else #1 \fi
/value ED
\psk@Scin {
value 0 ne { value log floor cvi /expon ED }{ /expon 0 def } ifelse
- value 10 expon exp div
- \psk@decimals -1 gt { 10 \psk@decimals exp dup 3 1 roll mul
+ value 10 expon exp div
+ \psk@decimals -1 gt { 10 \psk@decimals exp dup 3 1 roll mul
\ifPst@round round \else cvi \fi exch div } if
\psk@decimals 0 eq { cvi } if /numb ED
expon \psk@valuewidth string cvs /expon exch def
- numb \psk@valuewidth string cvs
+ numb \psk@valuewidth string cvs
\ifPst@comma dot2comma \fi % do we have to change dot to comma
/Output exch def
/txspc \psk@fontscale 4 div def
@@ -447,12 +447,12 @@
txspc 0 rmoveto mfont (10) show
txspc 2 div txspc 1.5 mul rmoveto mfontexp expon show }
{ value
- \psk@decimals -1 gt { 10 \psk@decimals exp dup 3 1 roll mul
+ \psk@decimals -1 gt { 10 \psk@decimals exp dup 3 1 roll mul
\ifPst@round round \else cvi \fi exch div } if
\psk@decimals 0 eq { cvi } if %inserted to handle decimals=0
- \psk@valuewidth string cvs
+ \psk@valuewidth string cvs
\ifPst@comma dot2comma \fi % do we have to change dot to comma
- \psk@xShift\space 0 moveto mfont %Output
+ \psk@xShift\space 0 moveto mfont %Output
show
} ifelse
}%
@@ -522,8 +522,22 @@
}%
%
\define@boolkey[psset]{pst-func}[Pst@]{printValue}[true]{}
+\define@boolkey[psset]{pst-func}[Pst@]{LineEnding}[true]{}
+\define@boolkey[psset]{pst-func}[Pst@]{VLines}[true]{}
\define@key[psset]{pst-func}{barwidth}[1]{\def\psFunc@barwidth{#1 }}% a factor, not a dimen
-\psset[pst-func]{printValue=false,barwidth=1}
+\define@key[psset]{pst-func}{rightEnd}[2]{\def\psFunc@rightEnd{#1 }}
+\define@key[psset]{pst-func}{leftEnd}[2]{\def\psFunc@leftEnd{#1 }}
+\define@key[psset]{pst-func}{labelangle}[90]{\def\psFunc@langle{#1 }}
+\define@key[psset]{pst-func}{xlabelsep}[0]{\def\psFunc@xlabelsep{#1 }}
+\define@key[psset]{pst-func}{radiusout}[2]{\def\psFunc@radiusout{#1 }}
+\define@key[psset]{pst-func}{radiusinL}[0]{\def\psFunc@radiusinL{#1 }}
+\define@key[psset]{pst-func}{radiusinR}[1.5]{\def\psFunc@radiusinR{#1 }}
+\define@key[psset]{pst-func}{LabelColor}[black]{\pst@getcolor{#1}\psk@LabelColor}
+\define@key[psset]{pst-func}{LineEndColorL}[green]{\pst@getcolor{#1}\psk@LineEndColorL}
+\define@key[psset]{pst-func}{LineEndColorR}[red]{\pst@getcolor{#1}\psk@LineEndColorR}
+\define@key[psset]{pst-func}{vlinestyle}[solid]{\def\psvlinestyle{#1}}
+\psset[pst-func]{printValue=false,barwidth=1,labelangle=90,xlabelsep=0,LabelColor=black,LineEndColorL=green,LineEndColorR=red,
+radiusout=2,radiusinL=0,radiusinR=1.5,LineEnding=true,leftEnd=1,rightEnd=2,VLines=false}
%
\def\psBinomial{\pst@object{psBinomial}}
\def\psBinomial@i#1#2{\psBinomial@ii#1,,,\@nil{#2}}%
@@ -535,9 +549,10 @@
\def\pst@tempA{#3}%
\ifx\pst@tempA\@empty\psBinomial@iii{#1}{#2}{#2}{#5}%
\else\psBinomial@iii{#1}{#2}{#3}{#5}\fi
- \fi}%
+ \fi}
+%
\def\psBinomial@iii#1#2#3#4{%
- \begin@OpenObj%
+ \begin@OpenObj
\addto@pscode{
/scx { \pst@number\psxunit mul } def
/scy { \pst@number\psyunit mul } def
@@ -565,23 +580,23 @@
kOld scx Y scy L k dx add scx Y scy L
\ifPst@markZeros k dx add scx 0 L kOld 1 add scx 0 L \fi
\ifPst@printValue
- gsave \psk@PSfont findfont \psk@fontscale scalefont setfont
- Y \psk@valuewidth string cvs
+ gsave \psk@PSfont findfont \psk@fontscale scalefont setfont \pst@usecolor\psk@LabelColor %
+ Y \psk@valuewidth string cvs
\ifPst@comma dot2comma \fi
- k scx \psk@fontscale 2 div add
+ k scx \psk@fontscale 2 div add \psFunc@xlabelsep scx add
Y scy \pst@number\pslabelsep add moveto
- 90 rotate show grestore
+ \psFunc@langle rotate show grestore
\fi
/kOld kOld 1 add def
} for
\ifPst@markZeros\else k dx add scx 0 L \fi % last line down to x-axis
}%
-% \psk@fillstyle%
-% \pst@stroke%
- \end@OpenObj%
+% \psk@fillstyle
+% \pst@stroke
+ \end@OpenObj
}%
%
-\def\psBinomialN{\pst@object{psBinomialN}}
+\def\psBinomialN{\pst@object{psBinomialN}}%
\def\psBinomialN@i#1#2{%
\leavevmode
\pst@killglue
@@ -589,12 +604,12 @@
\use@par
\init@pscode
\def\cplotstyle{curve}%
- \ifx\psplotstyle\cplotstyle \@nameuse{beginplot@\psplotstyle} \fi%
- \addto@pscode{
- \ifx\psplotstyle\cplotstyle /Curve true def \else /Curve false def \fi
- /scx { \pst@number\psxunit mul } def
+ \ifx\psplotstyle\cplotstyle \@nameuse{beginplot@\psplotstyle}\fi
+ \addto@pscode{%
+ \ifx\psplotstyle\cplotstyle /Curve true def \else /Curve false def \fi
+ /scx { \pst@number\psxunit mul } def
/scy { \pst@number\psyunit mul } def
- /N #1 def
+ /N #1 def
/p #2 def % probability
/q 1 p sub def
/E N p mul def
@@ -602,43 +617,286 @@
/dx 1.0 sigma div 2 div def
/xOld dx neg E sub sigma div def
/xEnd xOld neg dx add scx def
- Curve
+ Curve
{ /Coors [xOld dx sub scx 0] def }% saves the coordinates for curve
{ xOld scx 0 moveto } % starting point
- ifelse
- 0 1 N { % N times
+ ifelse
+ 0 1 N {% % N times
/k exch def % save loop variable
- k 0 eq
+ k 0 eq
{ /Y q N exp def }
{ /Y Y N k sub 1 add mul k div p mul q div def }
ifelse % recursive definition
/x k E sub sigma div dx add def
/y Y sigma mul def % normalize
- Curve
+ Curve
{ x dx sub scx y scy Coors aload length 2 add array astore /Coors exch def}
{ xOld scx y scy L x scx y scy L
- \ifPst@markZeros x scx 0 L \fi %
+ \ifPst@markZeros x scx 0 L \fi %
} ifelse
- \ifPst@printValue
- gsave \psk@PSfont findfont \psk@fontscale scalefont setfont
+ \ifPst@printValue
+ gsave \psk@PSfont findfont \psk@fontscale scalefont setfont \pst@usecolor\psk@LabelColor %
y \psk@valuewidth string cvs %/Output exch def
\ifPst@comma dot2comma \fi % do we have to change dot to comma
- x dx sub scx \psk@fontscale 2 div add
- y scy \pst@number\pslabelsep add moveto
- 90 rotate show grestore
+ x dx sub scx \psk@fontscale 2 div add \psFunc@xlabelsep scx add
+ y scy \pst@number\pslabelsep add moveto
+ \psFunc@langle rotate show grestore
\fi
/xOld x def
} for
- Curve { [ xEnd 0 Coors aload pop } if % showpoints on top of the stack
+ Curve { [ xEnd 0 Coors aload pop } if% showpoints on top of the stack
}%
- \ifx\psplotstyle\cplotstyle\@nameuse{endplot@\psplotstyle}\else%
- \psk@fillstyle%
- \pst@stroke%
- \fi%
- \use@pscode%
- \endgroup%
- \ignorespaces%
-}
+ \ifx\psplotstyle\cplotstyle\@nameuse{endplot@\psplotstyle}\else
+ \psk@fillstyle
+ \pst@stroke
+ \fi
+ \use@pscode
+ \endgroup
+ \ignorespaces
+}%
+\def\psBinomialF{\pst@object{psBinomialF}}
+\def\psBinomialF@i#1#2{\psBinomialF@ii#1,,,\@nil{#2}}%
+\def\psBinomialF@ii#1,#2,#3,#4\@nil#5{%
+ \def\pst@tempA{#2}%
+ \ifx\pst@tempA\@empty
+ \psBinomialF@iii{0}{#1}{#1}{#5}%
+ \else
+ \def\pst@tempA{#3}%
+ \ifx\pst@tempA\@empty\psBinomialF@iii{#1}{#2}{#2}{#5}%
+ \else\psBinomialF@iii{#1}{#2}{#3}{#5}\fi
+ \fi}%
+\def\psBinomialF@iii#1#2#3#4{%
+ \begin@OpenObj
+ \addto@pscode{
+ /scx { \pst@number\psxunit mul } def
+ /scy { \pst@number\psyunit mul } def
+ /m #1 def
+ /n #2 def
+ /N #3 def
+ /p #4 def
+ /dx \psFunc@barwidth 2 div def
+ /q 1 p sub def
+ \ifPst@markZeros /kOld dx neg m add def \else
+ /kOld m def \fi
+ \psFunc@leftEnd 0 eq
+ { }
+ { kOld 0 eq
+ { kOld \psFunc@leftEnd sub scx 0 moveto % starting point
+ \ifPst@LineEnding
+ kOld \psFunc@radiusout\pst@number\psxunit div sub scx 0 L stroke
+ kOld scx 0 newpath \psFunc@radiusout 0 360 arc kOld scx 0 \psFunc@radiusinR 360 0 arcn closepath \pst@usecolor\psk@LineEndColorR fill \else
+ kOld scx 0 L stroke \fi }
+ { } ifelse } ifelse
+ kOld scx 0 moveto % starting point
+ 0 1 m 1 sub {
+ /k exch def % save loop variable
+ k 0 eq
+ { /Y q N exp def
+ /F Y def}
+ { /Y Y N k sub 1 add mul k div p mul q div def
+ /F F Y add def }
+ ifelse
+ } for
+ m 1 n { % n-m+1 times
+ /k exch def % save loop variable
+ k 0 eq
+ { /Y q N exp def
+ /F Y def }
+ { /Y Y N k sub 1 add mul k div p mul q div def
+ /F F Y add def }
+ ifelse % recursive definition
+ \ifPst@markZeros kOld scx F scy L k dx add scx F scy L k dx add scx 0 L kOld 1 add scx 0 L
+ \else
+ kOld scx F scy newpath \psFunc@radiusout 0 360 arc kOld scx F scy \psFunc@radiusinL 360 0 arcn closepath \pst@usecolor\psk@LineEndColorL fill
+ kOld \ifPst@LineEnding\psFunc@radiusout\pst@number\psxunit div add \fi
+ scx F scy moveto
+ k 1 add
+ \ifPst@LineEnding\psFunc@radiusout\pst@number\psxunit div sub \fi
+ k N eq
+ { \psFunc@rightEnd add }
+ { } ifelse
+ scx F scy L \pst@usecolor\pslinecolor [1 0] 0 setdash stroke
+ \ifPst@LineEnding
+ k N eq
+ { }
+ { k 1 add scx F scy newpath \psFunc@radiusout 0 360 arc k 1 add scx F scy \psFunc@radiusinR 360 0 arcn closepath \pst@usecolor\psk@LineEndColorR fill }
+ ifelse
+ \ifPst@VLines
+ Y \psFunc@radiusout\pst@number\psyunit div 2 mul le
+ { }
+ { k scx F Y sub \psFunc@radiusout\pst@number\psyunit div add scy moveto k scx F \psFunc@radiusout\pst@number\psyunit div sub scy L \pst@usecolor\pslinecolor [3 2] 0 setdash stroke } ifelse \fi
+ \else
+ \ifPst@VLines
+ Y \psFunc@radiusout\pst@number\psyunit div 0.1 mul le
+ { }
+ { k scx F Y sub scy moveto k scx F scy L \pst@usecolor\pslinecolor [3 2] 0 setdash stroke } ifelse
+ \fi\fi\fi
+ \ifPst@printValue
+ gsave \psk@PSfont findfont \psk@fontscale scalefont setfont \pst@usecolor\psk@LabelColor %
+ F \psk@valuewidth string cvs
+ \ifPst@comma dot2comma \fi
+ k scx \psk@fontscale 2 div add \psFunc@xlabelsep scx add
+ F scy \pst@number\pslabelsep add moveto
+ \psFunc@langle rotate show grestore
+ \fi
+ /kOld kOld 1 add def
+ } for
+ }%
+ \end@OpenObj%
+}%
+%
+\def\psBinomialFS{\pst@object{psBinomialFS}}
+\def\psBinomialFS@i#1#2{\psBinomialFS@ii#1,,,\@nil{#2}}%
+\def\psBinomialFS@ii#1,#2,#3,#4\@nil#5{%
+ \def\pst@tempA{#2}%
+ \ifx\pst@tempA\@empty
+ \psBinomialFS@iii{0}{#1}{#1}{#5}%
+ \else
+ \def\pst@tempA{#3}%
+ \ifx\pst@tempA\@empty\psBinomialFS@iii{#1}{#2}{#2}{#5}%
+ \else\psBinomialFS@iii{#1}{#2}{#3}{#5}\fi
+ \fi}%
+\def\psBinomialFS@iii#1#2#3#4{%
+ \begin@OpenObj
+ \addto@pscode{
+ /scx { \pst@number\psxunit mul } def
+ /scy { \pst@number\psyunit mul } def
+ /m #1 def
+ /n #2 def
+ /N #3 def
+ /p #4 def
+ /dx \psFunc@barwidth 2 div def
+ /q 1 p sub def
+ \ifPst@markZeros /kOld dx neg m add def \else
+ /kOld m def \fi
+ kOld scx 0 moveto % starting point
+ 0 1 m 1 sub {
+ /k exch def % save loop variable
+ k 0 eq
+ { /Y q N exp def
+ /F Y def
+ /FS 1 F sub def}
+ { /Y Y N k sub 1 add mul k div p mul q div def
+ /F F Y add def
+ /FS 1 F sub def}
+ ifelse
+ } for
+ m 1 n { % n-m+1 times
+ /k exch def % save loop variable
+ k 0 eq
+ { /Y q N exp def
+ /F Y def
+ /FS 1 F sub def}
+ { /Y Y N k sub 1 add mul k div p mul q div def
+ /F F Y add def
+ /FS 1 F sub def}
+ ifelse % recursive definition
+ \ifPst@markZeros kOld scx FS scy L k dx add scx FS scy L k dx add scx 0 L kOld 1 add scx 0 L
+ \else
+ \ifPst@LineEnding
+ k 0 eq
+ { }
+ { kOld scx FS scy newpath \psFunc@radiusout 0 360 arc kOld scx FS scy \psFunc@radiusinL 360 0 arcn closepath \pst@usecolor\psk@LineEndColorL fill } ifelse \fi
+ kOld \ifPst@LineEnding\psFunc@radiusout\pst@number\psxunit div add \fi
+ k 0 eq
+ { \psFunc@leftEnd sub }
+ { } ifelse
+ scx FS scy moveto
+ k 1 add
+ \ifPst@LineEnding\psFunc@radiusout\pst@number\psxunit div sub \fi
+ k N eq
+ { \psFunc@rightEnd add }
+ { } ifelse
+ scx FS scy L \pst@usecolor\pslinecolor [1 0] 0 setdash stroke
+ \ifPst@LineEnding
+ k N eq
+ { }
+ { k 1 add scx FS scy newpath \psFunc@radiusout 0 360 arc k 1 add scx FS scy \psFunc@radiusinR 360 0 arcn closepath \pst@usecolor\psk@LineEndColorR fill }
+ ifelse
+ \ifPst@VLines
+ Y \psFunc@radiusout\pst@number\psyunit div 2 mul le
+ { }
+ { k scx FS Y add \psFunc@radiusout\pst@number\psyunit div sub scy moveto k scx FS \psFunc@radiusout\pst@number\psyunit div add scy L \pst@usecolor\pslinecolor [3 2] 0 setdash stroke } ifelse \fi
+ \else
+ \ifPst@VLines
+ Y \psFunc@radiusout\pst@number\psyunit div 0.1 mul le
+ { }
+ { k scx FS Y add scy moveto k scx FS scy L \pst@usecolor\pslinecolor [3 2] 0 setdash stroke } ifelse
+ \fi\fi\fi
+ \ifPst@printValue
+ gsave \psk@PSfont findfont \psk@fontscale scalefont setfont \pst@usecolor\psk@LabelColor %
+ FS \psk@valuewidth string cvs
+ \ifPst@comma dot2comma \fi
+ k scx \psk@fontscale 2 div add \psFunc@xlabelsep scx add
+ FS scy \pst@number\pslabelsep add moveto
+ \psFunc@langle rotate show grestore
+ \fi
+ /kOld kOld 1 add def
+ } for
+ }%
+ \end@OpenObj
+}%
+%
+\def\psBinomialC{\pst@object{psBinomialC}}
+\def\psBinomialC@i#1#2{%
+ \leavevmode
+ \pst@killglue
+ \begingroup
+ \use@par
+ \init@pscode
+ \def\cplotstyle{curve}%
+ \ifx\psplotstyle\cplotstyle \@nameuse{beginplot@\psplotstyle}\fi
+ \addto@pscode{%
+ \ifx\psplotstyle\cplotstyle /Curve true def \else /Curve false def \fi
+ /scx { \pst@number\psxunit mul } def
+ /scy { \pst@number\psyunit mul } def
+ /N #1 def
+ /p #2 def % Wahrscheinlichkeit
+ /q 1 p sub def % q = 1 - p
+ /E N p mul def % Erwartungswert
+ /sigma E q mul sqrt def % Varianz
+ /dx 1.0 sigma div 2 div def
+ /xOld dx neg E sub sigma div def
+ /xEnd xOld neg E add dx add scx def
+% /xOld dx neg sigma div def
+% /xEnd xOld neg dx add scx def
+ Curve
+ { /Coors [xOld dx sub scx 0] def }% saves the coordinates for curve
+ { xOld scx 0 moveto }% starting point
+ ifelse
+ 0 1 N { % N times
+ /k exch def % save loop variable
+ k 0 eq
+ { /Y q N exp def }
+ { /Y Y N k sub 1 add mul k div p mul q div def }
+ ifelse % recursive definition
+ /x k 1 div dx add def
+ /y Y 1 mul def % normalize
+ Curve
+ { x dx sub scx y scy Coors aload length 2 add array astore /Coors exch def}
+ { xOld scx y scy L x scx y scy L
+ \ifPst@markZeros x scx 0 L \fi %
+ } ifelse
+ \ifPst@printValue
+ gsave \psk@PSfont findfont \psk@fontscale scalefont setfont \pst@usecolor\psk@LabelColor %
+ y \psk@valuewidth string cvs %/Output exch def
+ \ifPst@comma dot2comma \fi % do we have to change dot to comma
+ x dx sub scx \psk@fontscale 2 div add \psFunc@xlabelsep scx add
+ y scy \pst@number\pslabelsep add moveto
+ \psFunc@langle rotate show grestore
+ \fi
+ /xOld x def
+ } for
+ Curve { [ xEnd 0 Coors aload pop } if% showpoints on top of the stack
+ }%
+\ifx\psplotstyle\cplotstyle\@nameuse{endplot@\psplotstyle}\else
+ \psk@fillstyle
+ \pst@stroke
+\fi
+\use@pscode
+\endgroup
+\ignorespaces}%
+%
%
\def\psPoisson{\pst@object{psPoisson}}% with contributions from Gerry Coombes
\def\psPoisson@i#1#2{\psPoisson@ii#1,,\@nil{#2}}%
@@ -709,9 +967,9 @@
\else
\addbefore@par{plotpoints=200,alpha=1,beta=1}%
\begin@OpenObj
- \psplot[algebraic=false]{#1}{#2}{
+ \psplot[algebraic=false]{#1}{#2}{
\psk@beta \psk@alpha add GAMMA
- \psk@beta GAMMA \psk@alpha GAMMA mul div
+ \psk@beta GAMMA \psk@alpha GAMMA mul div
1 x sub \psk@beta 1.0 sub exp mul
x \psk@alpha 1.0 sub exp mul }
\end@OpenObj%
@@ -803,7 +1061,7 @@
\ifdim#1pt<\z@ \psline(#1,0)(0,0)\def\pst@tempA{0}\fi
\psplot[algebraic=false]{\pst@tempA}{#2}{
\psk@alpha \psk@beta \psk@alpha neg exp mul % alpha*beta^(-alpha)
- x \psk@alpha 1 sub exp % x^(alpha-1)
+ x \psk@alpha 1 sub exp % x^(alpha-1)
mul
Euler x \psk@beta div \psk@alpha exp neg exp % e^(-(x/beta)^alpha))
mul }
@@ -848,41 +1106,41 @@
\iffalse
\def\Lorenz@code{
/D {} def
- [ \L@Data\space counttomark dup
+ [ \L@Data\space counttomark dup
1 sub /m ED 2 div cvi /n ED % m=0..n-1 n=number of pairs
] /xyValues ED
- /Xval [] def /Yval [] def /Xmax 0 def
+ /Xval [] def /Yval [] def /Xmax 0 def
/Xsum 0 def /Ysum 0 def /XYsum 0 def
xyValues aload pop % [ x y x y x y ... ]
n { 2 copy mul XYsum add /XYsum ED
- dup
- Yval aload length 1 add array astore /Yval ED
+ dup
+ Yval aload length 1 add array astore /Yval ED
Ysum add /Ysum ED
dup
- Xval aload length 1 add array astore /Xval ED
+ Xval aload length 1 add array astore /Xval ED
dup Xsum add /Xsum ED
dup Xmax gt { /Xmax ED }{ pop } ifelse
} repeat
Xval bubblesort /Xval ED
Yval bubblesort /Yval ED
- Xval { Xmax div } forall n array astore /XvalRelMax ED
- Xval { Xsum div } forall n array astore /XvalRel ED
- Yval { Ysum div } forall n array astore /YvalRel ED
- 0 1 n 1 sub {
+ Xval { Xmax div } forall n array astore /XvalRelMax ED
+ Xval { Xsum div } forall n array astore /XvalRel ED
+ Yval { Ysum div } forall n array astore /YvalRel ED
+ 0 1 n 1 sub {
cvi /Index ED
- Xval Index get
+ Xval Index get
Yval Index get
mul } for
n array astore /XmulY ED
- XmulY aload length 1 sub { add } repeat
+ XmulY aload length 1 sub { add } repeat
/XmulYsum ED
- XmulY { XmulYsum div } forall
+ XmulY { XmulYsum div } forall
n array astore /XmulYdivXmulYsum ED
/X [0] def
/Y [0] def
/Xsum 0 def /Ysum 0 def
0 1 n 1 sub {
- /Index ED
+ /Index ED
% XvalRel Index get Xsum add /Xsum ED
% X aload length 1 add Xsum exch array astore /X ED
X aload length 1 add XvalRelMax Index get exch array astore /X ED %%
@@ -891,52 +1149,52 @@
} for
\ifPst@Gini
0 % start value for Gini
- 0 1 X length 2 sub {
+ 0 1 X length 2 sub {
/Index ED
Y Index get Y Index 1 add get add 2 div % yHeight=(y0+y1)/2
- X Index 1 add get X Index get sub abs % xWidth=x1-x0
+ X Index 1 add get X Index get sub abs % xWidth=x1-x0
mul % x*y
add
} for
2 mul 1 sub neg % triangle area divided by the area under the polygon
- \psk@PSfont findfont \psk@fontscale scalefont setfont
+ \psk@PSfont findfont \psk@fontscale scalefont setfont
\psk@decimals -1 gt { 10 \psk@decimals exp dup 3 1 roll mul cvi exch div } if
\psk@valuewidth string cvs %/Output exch def % save output
\ifPst@comma dot2comma \fi % do we have to change dot to comma
/Output ED
- \psk@xShift\space -30 moveto (Gini: ) show
- Output show
+ \psk@xShift\space -30 moveto (Gini: ) show
+ Output show
\fi
- 0 1 n { dup X exch get exch Y exch get } for
+ 0 1 n { dup X exch get exch Y exch get } for
\if@star 1 0 0 0 \fi % add values for the closed curve
}% filling the area under the curve.
\fi
%%%%%%%%%%%%%%%%%%%%%%5
\def\Lorenz@code{
[ #1 ] dup length /n ED
- bubblesort /Yval ED
+ bubblesort /Yval ED
[ 1 1 n { } for ] /Xval ED
- /Xsum n dup 1 add mul 2 div cvi def
+ /Xsum n dup 1 add mul 2 div cvi def
/Ysum 0 def /XYsum 0 def
0 Yval { add } forall /Ysum ED
- Xval { n div } forall n array astore /XvalRelMax ED
- Xval { Xsum div } forall n array astore /XvalRel ED
- Yval { Ysum div } forall n array astore /YvalRel ED
- 0 1 n 1 sub {
+ Xval { n div } forall n array astore /XvalRelMax ED
+ Xval { Xsum div } forall n array astore /XvalRel ED
+ Yval { Ysum div } forall n array astore /YvalRel ED
+ 0 1 n 1 sub {
/Index ED
- Xval Index get
+ Xval Index get
Yval Index get
mul } for
n array astore /XmulY ED
- XmulY aload length 1 sub { add } repeat
+ XmulY aload length 1 sub { add } repeat
/XmulYsum ED
- XmulY { XmulYsum div } forall
+ XmulY { XmulYsum div } forall
n array astore /XmulYdivXmulYsum ED
/X [0] def
/Y [0] def
/Xsum 0 def /Ysum 0 def
0 1 n 1 sub {
- /Index ED
+ /Index ED
% XvalRel Index get Xsum add /Xsum ED
% X aload length 1 add Xsum exch array astore /X ED
X aload length 1 add XvalRelMax Index get exch array astore /X ED %%
@@ -945,23 +1203,23 @@
} for
\ifPst@Gini
0 % start value for Gini
- 0 1 X length 2 sub {
+ 0 1 X length 2 sub {
/Index ED
Y Index get Y Index 1 add get add 2 div % yHeight=(y0+y1)/2
- X Index 1 add get X Index get sub abs % xWidth=x1-x0
+ X Index 1 add get X Index get sub abs % xWidth=x1-x0
mul % x*y
add
} for
2 mul 1 sub neg % triangle area divided by the area under the polygon
- \psk@PSfont findfont \psk@fontscale scalefont setfont
+ \psk@PSfont findfont \psk@fontscale scalefont setfont
\psk@decimals -1 gt { 10 \psk@decimals exp dup 3 1 roll mul cvi exch div } if
\psk@valuewidth string cvs %/Output exch def % save output
\ifPst@comma dot2comma \fi % do we have to change dot to comma
/Output ED
- \psk@xShift\space -30 moveto (Gini: ) show
- Output show
+ \psk@xShift\space -30 moveto (Gini: ) show
+ Output show
\fi
- 0 1 n { dup X exch get exch Y exch get } for
+ 0 1 n { dup X exch get exch Y exch get } for
\if@star 1 0 0 0 \fi % add values for the closed curve
}% filling the area under the curve.
\if@star\listplot*{\Lorenz@code}\else\listplot{\Lorenz@code}%
@@ -982,9 +1240,9 @@
\addbefore@par{plotpoints=200}%
\use@par
\parametricplot{0}{360}{%
- t cos dup mul 1 #1\space div exp \pst@radiusA \pst@number\psxunit div mul
+ t cos dup mul 1 #1\space div exp \pst@radiusA \pst@number\psxunit div mul
t 90 gt { t 270 lt { neg } if } if
- t sin dup mul 1 #1\space div exp \pst@radiusB \pst@number\psyunit div mul
+ t sin dup mul 1 #1\space div exp \pst@radiusB \pst@number\psyunit div mul
t 180 gt { neg } if }
\endgroup\ignorespaces}
%
@@ -996,9 +1254,9 @@
\psplot{#1}{#2}[/ps@a #3 def /ps@b #4 def]{
/ps@n 0 def
/ps@WS 0 def
- {
- ps@a ps@n exp ps@b ps@n exp Pi mul x mul RadtoDeg cos mul
- dup abs \psk@epsilon gt { ps@WS add /ps@WS ED }{ ps@WS add exit } ifelse
+ {
+ ps@a ps@n exp ps@b ps@n exp Pi mul x mul RadtoDeg cos mul
+ dup abs \psk@epsilon gt { ps@WS add /ps@WS ED }{ ps@WS add exit } ifelse
ps@n 1 add /ps@n ED
} loop
}%
@@ -1010,9 +1268,9 @@
\psplot{#1}{#2}[/ps@a #3 def]{
/ps@k 1 def
/ps@WS 0 def
- {
- ps@k ps@a exp Pi mul dup x mul RadtoDeg sin exch div
- dup abs \psk@epsilon gt { ps@WS add /ps@WS ED }{ ps@WS add exit } ifelse
+ {
+ ps@k ps@a exp Pi mul dup x mul RadtoDeg sin exch div
+ dup abs \psk@epsilon gt { ps@WS add /ps@WS ED }{ ps@WS add exit } ifelse
ps@k 1 add /ps@k ED
} loop
}%
@@ -1044,12 +1302,12 @@
/yMin #2 def
/yMax #4 def
#5 % additional PS code
- \ifPst@polarplot
+ \ifPst@polarplot
/@PolarAlgPlot (#6) tx@addDict begin AlgParser end cvx def
/Func {
/phi y x atan def
- /r x y Pyth def
- \ifPst@algebraic @PolarAlgPlot \else #6 \fi } def
+ /r x y Pyth def
+ \ifPst@algebraic @PolarAlgPlot \else #6 \fi } def
\else
/Func \ifPst@algebraic (#6) tx@addDict begin AlgParser end cvx \else { #6 } \fi def
\fi
@@ -1057,17 +1315,17 @@
/yPixel yMax yMin sub \pst@number\psyunit mul round cvi def
/dx xMax xMin sub xPixel div def
/dy yMax yMin sub yPixel div def
- /setpixel {
- dy div exch
- dx div exch
- \ifPst@saveData
+ /setpixel {
+ dy div exch
+ dx div exch
+ \ifPst@saveData
2 copy
- \pst@number\psyunit div exch \pst@number\psxunit div
- 20 string cvs Pst@data exch writestring
- Pst@data (\space) writestring
- 20 string cvs Pst@data exch writestring
+ \pst@number\psyunit div exch \pst@number\psxunit div
+ 20 string cvs Pst@data exch writestring
+ Pst@data (\space) writestring
+ 20 string cvs Pst@data exch writestring
% Pst@data (\string\]) writestring
- Pst@data (\string\n) writestring
+ Pst@data (\string\n) writestring
\fi
\pst@number\pslinewidth 2 div 0 360 arc fill } bind def
%
@@ -1078,7 +1336,7 @@
\ifPst@saveData Pst@data ([\string\n) writestring \fi
yMin dy \psk@stepFactor\space mul yMax {
/y exch def
- Func 0 lt
+ Func 0 lt
{ VZ { x y setpixel /VZ false def} if }
{ VZ {}{ x y setpixel /VZ true def } ifelse } ifelse
} for
@@ -1092,7 +1350,7 @@
\ifPst@saveData Pst@data ([\string\n) writestring \fi
xMin dx \psk@stepFactor\space mul xMax {
/x exch def
- Func 0 lt
+ Func 0 lt
{ VZ { x y setpixel /VZ false def} if }
{ VZ {}{ x y setpixel /VZ true def } ifelse } ifelse
} for
@@ -1105,7 +1363,7 @@
/y exch def
xMin dx \psk@stepFactor\space mul xMax {
/x exch def
- Func 0 lt
+ Func 0 lt
{ VZ { x y setpixel /VZ false def} if }
{ VZ {}{ x y setpixel /VZ true def } ifelse } ifelse
} for
@@ -1125,7 +1383,7 @@
\psplot[fillstyle=none]{#1}{#2}{#4}% original function
\ifPst@algebraic
\psplot[fillstyle=none]{#1}{#2}{-(#4)}
- \else
+ \else
\psplot[fillstyle=none]{#1}{#2}{#4 neg}% mirrored at the x-axis
\fi
\multido{\iA=1+1}{#3}{% run it #3 times with increment \A
@@ -1134,7 +1392,7 @@
/dX #2 #1 sub #3 div def % delta x, the step
/Start dX \iA\space 1 sub mul #1 add def % xStart
/End Start dX add def % xEnd=xStart+dX
- /Height End Start add 2 div /x ED
+ /Height End Start add 2 div /x ED
\ifPst@algebraic (#4) AlgParser cvx exec \else #4 \fi def } % height=f(x)
% x is the mean between Start+End
\psellipticarc(!Start 0)(! Height 8 div Height){90}{270}
@@ -1144,9 +1402,9 @@
% draw the other half of the ellipse
\rlineto(!dX neg 0)}}% draw a line in negative x-direction
\psset{fillstyle=none}
-% \psellipse(#2,0)(!#2 dup #1 sub #3 div 2 div sub /x ED #4 dup
+% \psellipse(#2,0)(!#2 dup #1 sub #3 div 2 div sub /x ED #4 dup
% 8 div exch)% draw again the ellipse to get the borderline.
- \psellipse(#2,0)(!{ #2 dup #1 sub #3 div 2 div sub /x ED
+ \psellipse(#2,0)(!{ #2 dup #1 sub #3 div 2 div sub /x ED
\ifPst@algebraic (#4) AlgParser cvx exec \else #4 \fi dup
8 div exch}) % draw again the ellipse to get the borderline.
\psset{plotstyle=line,linestyle=dashed,
@@ -1154,7 +1412,7 @@
\psplot[fillstyle=none]{#1}{#2}{#4}
\ifPst@algebraic
\psplot[fillstyle=none]{#1}{#2}{-(#4)}
- \else
+ \else
\psplot[fillstyle=none]{#1}{#2}{#4 neg}% mirrored at the x-axis
\fi
% draw again the curves to get the borderline
@@ -1177,9 +1435,9 @@
\def\psBezier@ii{%
\addto@pscode{%
\psk@plotpoints % step for Bezier T=0,0+epsilon,0+i*epsilon,...,1
- \pst@BezierType % type of the Bezier curve 2,3,4,...
- \txFunc@BezierCurve
- \ifshowpoints \txFunc@BezierShowPoints \else pop \fi
+ \pst@BezierType % type of the Bezier curve 2,3,4,...
+ \txFunc@BezierCurve
+ \ifshowpoints \txFunc@BezierShowPoints \else pop \fi
}%
\end@OpenObj}
%
@@ -1190,13 +1448,13 @@
\def\psBernstein{\pst@object{psBernstein}}% \psBernstein[options](t1,t2)(i,n)
\def\psBernstein@i(#1,#2){%
\@ifnextchar({\psBernstein@ii(#1,#2)}{\psBernstein@ii(0,1)(#1,#2)}}
-%
+%
\def\psBernstein@ii(#1,#2)(#3,#4){% (tStart,tEnd)(i,n)
\addbefore@par{plotpoints=200}%
\begin@OpenObj
\addto@pscode{%
/ScreenCoor { \tx@ScreenCoor } def
- #1\space #2\space
+ #1\space #2\space
1.0 \psk@plotpoints\space div % step=1/plotpoints
#3\space #4\space
% on stack we have tStart tEnd epsilon i n
@@ -1211,29 +1469,29 @@
\begin@ClosedObj
\addto@pscode{
1 1 #3 {
- dup
+ dup
/ipSave ED % save loop value
/ip ED % dito
1 1 #3 {
dup
/iqSave ED % save loop value
/iq ED % dito
- {
+ {
iq 0 le { exit } if
- ip iq mod
+ ip iq mod
/ip iq def
- /iq ED
+ /iq ED
} loop
- ip 1 eq {
+ ip 1 eq {
/xVal ipSave iqSave div def
xVal #1 ge { xVal #2 le {
\psk@dotsize
\@nameuse{psds@\psk@dotstyle}
- \pst@usecolor\pslinecolor xVal 1 iqSave div \tx@ScreenCoor
+ \pst@usecolor\pslinecolor xVal 1 iqSave div \tx@ScreenCoor
2 copy pop 0 moveto lineto } if } if
% 2 copy moveto Dot } if } if
} if
- } for
+ } for
} for
}%
\end@ClosedObj%
@@ -1252,7 +1510,7 @@
/dx x1 x sub \psk@plotpoints div def
#3
/xy {
-% x
+% x
tx@FuncDict begin
#4 aload pop \pst@number\psyunit mul exch \pst@number\psxunit mul exch
end
@@ -1268,16 +1526,18 @@
\endgroup
\ignorespaces}
%
+\define@boolkey[psset]{pst-func}[Pst@]{xory}[true]{}
+\define@boolkey[psset]{pst-func}[Pst@]{approx}[true]{}
+\define@boolkey[psset]{pst-func}[Pst@]{Framed}[true]{}
\define@boolkey[psset]{pst-func}[Pst@]{Newton}[true]{}
\define@boolkey[psset]{pst-func}[Pst@]{PrintCoord}[true]{}
\define@boolkey[psset]{pst-func}[Pst@]{onlyNode}[true]{}
\define@boolkey[psset]{pst-func}[Pst@]{onlyYVal}[true]{}
\define@boolkey[psset]{pst-func}[Pst@]{originV}[true]{}
-\define@key[psset]{pst-func}{PointName}[]{\def\psk@func@PointName{#1}}
+\define@key[psset]{pst-func}{PointName}[I]{\def\psk@func@PointName{#1}}
\define@key[psset]{pst-func}{ydecimals}[2]{\pst@getint{#1}\psk@ydecimals }
\psset[pst-func]{originV=false,onlyNode=false,ydecimals=2,
- PrintCoord=false,onlyYVal=false,Newton=false,PointName=I,
-}
+ PrintCoord=false,onlyYVal=false,Newton=false,PointName=I,Framed=false,xory=false,approx=true}
%
%--------------------------------------------------------------------
%------------- calculate the value of an intersectionpoint -----------
@@ -1285,10 +1545,10 @@
\def\psZero{\def\pst@par{}\pst@object{psZero}}
\def\psZero@i(#1,#2)#3{\@ifnextchar[{\psZero@ii(#1,#2)#3}{\psZero@ii(#1,#2){#3}[0]}}
\def\psZero@ii(#1,#2)#3[#4]#5{%
-% (#1,#2) Intervall für die Nullstelle, bzw #1 Startwert für Newton, #3 1. Funktion, #4 2. Funktion, #5 Knotenname
+% (#1,#2) Intervall f\"{u}r die Nullstelle, bzw #1 Startwert f\"{u}r Newton, #3 1. Funktion, #4 2. Funktion, #5 Knotenname
\begingroup
\pst@killglue
-% \addbefore@par{fontscale=40,PSfont=Times-Roman}%
+ \addbefore@par{framesep=1pt}%fontscale=40,PSfont=Times-Roman}%
\use@par
\pst@Verb{
/FunctionA
@@ -1296,7 +1556,7 @@
/FunctionB
\ifPst@algebraic (#4) tx@AlgToPs begin AlgToPs end cvx \else {#4} \fi def
\ifPst@Newton % --------------------------- Newton-Verfahren --- TS 05.2014
- /eps 1e-6 def % eps für (f(x+eps)-f(x))/eps
+ /eps 1e-6 def % eps f\"{u}r (f(x+eps)-f(x))/eps
/x0 #1 def % Startwert wird vorgegeben
/Xend x0 def
{
@@ -1325,24 +1585,25 @@
F_1 F_M mul 0 ge {/Xinf xM def} {/Xsup xM def} ifelse % F_1 * F_M > 0 (F_1 und F_M haben gleiches VZ) => neuer linker x-Wert = xM2
Xinf Xsup sub abs 1e-6 le {exit} if } loop % Die Schleife endet, wenn die Differenz von linkem und rechtem Wert < 10^-6
\fi
- /x xM def FunctionA /yM exch def % x wird Mittelwert und an dieser Stelle die Funktion berechnet und als yM2 definiert
+ /x xM def FunctionA /yM exch def % x wird Mittelwert und an dieser Stelle die Funktion berechnet und als yM definiert
}%
- \pnode(! xM yM){#5}%
- \addto@pscode{
- \ifPst@onlyNode \else
- /dec \psk@decimals\space def % Anzahl der Dezimahlen für x
- /ydec \psk@ydecimals\space def % Anzahl der Dezimalen für y
- /symb { /Symbol findfont \psk@fontscale\space scalefont setfont } bind def % Symbolschrift für Klammer und senkrechten Strich
- /schrift { \psk@PSfont findfont \psk@fontscale scalefont setfont } bind def % Schrift für die Ergebnisse
- /TiefSchrift { /Symbol findfont \psk@fontscale 1.6 div scalefont setfont } bind def % Schrift für tiefergestellte Buchstaben
- /spdx \psk@fontscale 4 div def % Abstand, der mit der Schriftgöße skaliert ist
- /spdy \psk@fontscale 15 div def % Abstand, der mit der Schriftgöße skaliert ist
- /Wert { 10 dec exp mul round 10 dec exp div dec 0 eq {cvi 15 string cvs} {15 string cvs } ifelse % x-Wert runden und als string ablegen
+\pnode(! xM yM){#5}%
+\addto@pscode{%
+\ifPst@onlyNode\else
+ /dec \psk@decimals\space def % Anzahl der Dezimahlen f\"{u}r x
+ /ydec \psk@ydecimals\space def % Anzahl der Dezimalen f\"{u}r y
+ /symb { /Symbol findfont \psk@fontscale\space scalefont setfont } bind def % Symbolschrift f\"{u}r Klammer und senkrechten Strich
+ /schrift { \psk@PSfont findfont \psk@fontscale scalefont setfont } bind def % Schrift f\"{u}r die Ergebnisse
+ /TiefSchrift { /Symbol findfont \psk@fontscale 1.8 div scalefont setfont } bind def % Schrift f\"{u}r tiefergestellte Buchstaben
+ /spdx \psk@fontscale 4 div def % Abstand, der mit der Schriftg\"{o}{\ss}e skaliert ist
+ /spdy \psk@fontscale 15 div def % Abstand, der mit der Schriftg\"{o}{\ss}e skaliert ist
+ /Wert { dec -1 le { /dec 15 def } if 10 dec exp mul round 10 dec exp div dec 0 eq { cvi 15 string cvs } { 15 string cvs } ifelse % x-Wert runden und als string ablegen
\ifPst@comma dot2comma \fi show } def % gegebenenfalls Komma statt Punkt und Ergebnis anzeigen
- /yWert { 10 ydec exp mul round 10 ydec exp div ydec 0 eq {cvi 15 string cvs} {15 string cvs } ifelse % y-Wert runden und als string ablegen
+ /yWert { 10 ydec exp mul round 10 ydec exp div ydec 0 eq { cvi 15 string cvs } { 15 string cvs } ifelse % y-Wert runden und als string ablegen
\ifPst@comma dot2comma \fi show } def % gegebenenfalls Komma statt Punkt und Ergebnis anzeigen
/FunctionA \ifPst@algebraic (#3) tx@AlgToPs begin AlgToPs end cvx \else {#3} \fi def
/FunctionB \ifPst@algebraic (#4) tx@AlgToPs begin AlgToPs end cvx \else {#4} \fi def
+ /frs \pst@number\psframesep def
\ifPst@Newton
/eps 1e-6 def
/x0 #1 def
@@ -1376,22 +1637,95 @@
yM \psk@yShift\space add \pst@number\psyunit mul
\fi
\pst@usecolor\pslinecolor
- \ifPst@PrintCoord
- moveto schrift (\psk@func@PointName) show
+ \ifPst@PrintCoord
+/xytext { moveto schrift (\psk@func@PointName) show
0 spdy 2 mul neg rmoveto TiefSchrift (\psk@postString) show
0 spdy 3 mul rmoveto symb (\string\050) show
0 spdy neg rmoveto schrift xM Wert
spdx 3 div spdy rmoveto symb (\string\174) show
- spdx 3 div spdy neg rmoveto yM yWert 0 spdy rmoveto symb (\string\051) show
+ spdx 3 div spdy neg rmoveto schrift yM yWert 0 spdy rmoveto symb (\string\051) show } bind def
+ xytext
+ 0 spdy neg rmoveto
+% ------------------------------------------------------------------------------ TS 03.2017
+ \ifPst@Framed
+ frs \psk@fontscale 0.15 mul frs add neg rmoveto
+ 0 \psk@fontscale 0.9 mul frs 2 mul add rlineto
+ \ifPst@originV
+ frs neg \psk@fontscale 0.75 mul frs add L
+ \else
+ xM \psk@xShift\space add \pst@number\psxunit mul frs sub
+ yM \psk@yShift\space add \pst@number\psyunit mul \psk@fontscale 0.75 mul add frs add L
+ \fi
+ 0 \psk@fontscale 0.9 mul frs 2 mul add neg rlineto closepath
+ gsave
+ \pst@usecolor\psfillcolor \tx@setTransparency fill
+ grestore
+ \ifx\pslinestyle\@none\else
+ \pst@number\pslinewidth SLW \pst@usecolor\pslinecolor \tx@setStrokeTransparency \@nameuse{psls@\pslinestyle} stroke
+ \fi
+ \ifPst@originV 0 0 \else
+ xM \psk@xShift\space add \pst@number\psxunit mul
+ yM \psk@yShift\space add \pst@number\psyunit mul
+ \fi
+ xytext
+ 0 spdy neg rmoveto
+ \fi
+%------------------------------ Wenn nicht die Form P(a|b) sondern x = a oder y = b oder nur a oder nur b -------------------
\else
- \ifPst@onlyYVal moveto schrift yM yWert \else moveto schrift xM Wert \fi
- \fi\fi}%
- \ifPst@markZeros \psdot(#5)\fi
+ \ifPst@originV 0 0 \else
+ xM \psk@xShift\space add \pst@number\psxunit mul
+ yM \psk@yShift\space add \pst@number\psyunit mul
+ \fi
+ /xorytext { moveto schrift
+ \ifPst@onlyYVal% nur der y-Wert
+ \ifPst@xory% in Form von y=b
+ (\psk@func@PointName) show
+ spdx 5 div neg spdy 2.2 mul neg rmoveto TiefSchrift (\psk@postString) show
+ spdx 1.5 div spdy 2 mul rmoveto symb(\ifPst@approx \string \273 \else \string = \fi) show
+ spdx 1.5 div neg 0 rmoveto schrift yM yWert
+ \else schrift yM yWert
+ \fi
+ \else
+ \ifPst@xory% in Form x = a
+ (\psk@func@PointName) show
+ spdx 7 div neg spdy 2.2 mul neg rmoveto TiefSchrift (\psk@postString) show
+ spdx 1.5 div spdy 2 mul rmoveto symb (\ifPst@approx \string \273 \else \string = \fi) show
+ spdx 1.5 div neg 0 rmoveto schrift xM Wert
+ \else schrift xM Wert
+ \fi
+ \fi } bind def
+ xorytext
+ \ifPst@Framed%------------------------------ Rahmenbeginn ------------------------------
+ frs \psk@fontscale 0.14 mul frs add neg rmoveto
+ 0 \psk@fontscale 0.9 mul frs 2 mul add rlineto
+ \ifPst@originV
+ frs neg \psk@fontscale 0.75 mul frs add L
+ \else
+ xM \psk@xShift\space add \pst@number\psxunit mul frs sub
+ yM \psk@yShift\space add \pst@number\psyunit mul \psk@fontscale 0.75 mul add frs add L
+ \fi
+ 0 \psk@fontscale 0.9 mul frs 2 mul add neg rlineto closepath
+ gsave
+ \pst@usecolor\psfillcolor \tx@setTransparency fill
+ grestore
+ \ifx\pslinestyle\@none\else
+ \pst@number\pslinewidth SLW \pst@usecolor\pslinecolor \tx@setStrokeTransparency \@nameuse{psls@\pslinestyle} stroke
+ \fi
+ \ifPst@originV 0 0 \else
+ xM \psk@xShift\space add \pst@number\psxunit mul
+ yM \psk@yShift\space add \pst@number\psyunit mul
+ \fi
+ xorytext
+ \fi
+ \fi
+\fi}%
+\ifPst@markZeros\psdot(#5)\fi
\endgroup\use@pscode\ignorespaces
-}%
+}%
%
\catcode`\@=\PstAtCode\relax
%
%% END: pst-func.tex
\endinput
%
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-func.tlpobj new/tlpkg/tlpobj/pst-func.tlpobj
--- old/tlpkg/tlpobj/pst-func.tlpobj 2016-05-03 03:18:39.000000000 +0200
+++ new/tlpkg/tlpobj/pst-func.tlpobj 2017-04-19 02:06:49.000000000 +0200
@@ -1,6 +1,6 @@
name pst-func
category Package
-revision 40824
+revision 43912
shortdesc PSTricks package for plotting mathematical functions
relocated 1
longdesc The package is built for use with PSTricks. It provides macros
@@ -22,12 +22,12 @@
longdesc Vasicek function for describing the evolution of interest
longdesc rates; and implicit functions. The plots may be generated as
longdesc volumes of rotation about the X-axis, as well.
-runfiles size=17
+runfiles size=20
RELOC/dvips/pst-func/pst-func.pro
RELOC/tex/generic/pst-func/pst-func.tex
RELOC/tex/latex/pst-func/pst-func.sty
catalogue-ctan /graphics/pstricks/contrib/pst-func
-catalogue-date 2016-05-01 17:26:53 +0200
+catalogue-date 2017-04-18 17:13:42 +0200
catalogue-license lppl
catalogue-topics maths graphics-use pstricks
-catalogue-version 0.82
+catalogue-version 0.85
++++++ pst-gantt.doc.tar.xz ++++++
++++++ pst-gantt.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-gantt.tlpobj new/tlpkg/tlpobj/pst-gantt.tlpobj
--- old/tlpkg/tlpobj/pst-gantt.tlpobj 2016-04-14 19:36:56.000000000 +0200
+++ new/tlpkg/tlpobj/pst-gantt.tlpobj 2017-04-14 17:55:19.000000000 +0200
@@ -10,7 +10,7 @@
RELOC/tex/generic/pst-gantt/pst-gantt.tex
RELOC/tex/latex/pst-gantt/pst-gantt.sty
catalogue-ctan /graphics/pstricks/contrib/pst-gantt
-catalogue-date 2015-08-15 05:39:34 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics diagram gantt pstricks
catalogue-version 0.22a
++++++ pst-geo.doc.tar.xz ++++++
/work/SRC/openSUSE:Factory/texlive-specs-s/pst-geo.doc.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-s.new/pst-geo.doc.tar.xz differ: char 25, line 1
++++++ pst-geo.tar.xz ++++++
/work/SRC/openSUSE:Factory/texlive-specs-s/pst-geo.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-s.new/pst-geo.tar.xz differ: char 27, line 1
++++++ pst-ghsb.doc.tar.xz ++++++
++++++ pst-ghsb.tar.xz ++++++
++++++ pst-gr3d.doc.tar.xz ++++++
++++++ pst-gr3d.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-gr3d.tlpobj new/tlpkg/tlpobj/pst-gr3d.tlpobj
--- old/tlpkg/tlpobj/pst-gr3d.tlpobj 2016-04-14 19:37:20.000000000 +0200
+++ new/tlpkg/tlpobj/pst-gr3d.tlpobj 2017-04-14 17:56:16.000000000 +0200
@@ -10,7 +10,7 @@
RELOC/tex/generic/pst-gr3d/pst-gr3d.tex
RELOC/tex/latex/pst-gr3d/pst-gr3d.sty
catalogue-ctan /graphics/pstricks/contrib/pst-gr3d
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics typeset-grid graphics-3d pstricks
catalogue-version 1.34
++++++ pst-grad.doc.tar.xz ++++++
++++++ pst-grad.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-grad.tlpobj new/tlpkg/tlpobj/pst-grad.tlpobj
--- old/tlpkg/tlpobj/pst-grad.tlpobj 2016-04-14 19:37:20.000000000 +0200
+++ new/tlpkg/tlpobj/pst-grad.tlpobj 2017-04-14 17:56:16.000000000 +0200
@@ -11,7 +11,7 @@
RELOC/tex/generic/pst-grad/pst-grad.tex
RELOC/tex/latex/pst-grad/pst-grad.sty
catalogue-ctan /graphics/pstricks/contrib/pst-grad
-catalogue-date 2015-08-15 05:39:34 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics colour pstricks
catalogue-version 1.06
++++++ pst-graphicx.doc.tar.xz ++++++
++++++ pst-graphicx.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-graphicx.tlpobj new/tlpkg/tlpobj/pst-graphicx.tlpobj
--- old/tlpkg/tlpobj/pst-graphicx.tlpobj 2016-04-14 19:37:20.000000000 +0200
+++ new/tlpkg/tlpobj/pst-graphicx.tlpobj 2017-04-14 17:56:16.000000000 +0200
@@ -9,7 +9,7 @@
runfiles size=1
RELOC/tex/generic/pst-graphicx/pst-graphicx.tex
catalogue-ctan /graphics/pstricks/contrib/pst-graphicx
-catalogue-date 2015-08-15 05:39:34 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics graphics-incl
catalogue-version 0.02
++++++ pst-infixplot.doc.tar.xz ++++++
++++++ pst-infixplot.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-infixplot.tlpobj new/tlpkg/tlpobj/pst-infixplot.tlpobj
--- old/tlpkg/tlpobj/pst-infixplot.tlpobj 2016-04-14 19:37:20.000000000 +0200
+++ new/tlpkg/tlpobj/pst-infixplot.tlpobj 2017-04-14 17:56:16.000000000 +0200
@@ -15,7 +15,7 @@
RELOC/tex/latex/pst-infixplot/infix-RPN.sty
RELOC/tex/latex/pst-infixplot/pst-infixplot.sty
catalogue-ctan /graphics/pstricks/contrib/pst-infixplot
-catalogue-date 2015-08-15 05:39:34 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics graphics-plot pstricks
catalogue-version 0.11
++++++ pst-intersect.doc.tar.xz ++++++
++++++ pst-intersect.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-intersect.tlpobj new/tlpkg/tlpobj/pst-intersect.tlpobj
--- old/tlpkg/tlpobj/pst-intersect.tlpobj 2016-04-14 19:37:21.000000000 +0200
+++ new/tlpkg/tlpobj/pst-intersect.tlpobj 2017-04-14 17:56:16.000000000 +0200
@@ -11,7 +11,7 @@
RELOC/tex/generic/pst-intersect/pst-intersect.tex
RELOC/tex/latex/pst-intersect/pst-intersect.sty
catalogue-ctan /graphics/pstricks/contrib/pst-intersect
-catalogue-date 2015-08-15 05:39:34 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics graphics-supp pstricks
catalogue-version 0.4
++++++ pst-jtree.doc.tar.xz ++++++
++++++ pst-jtree.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-jtree.tlpobj new/tlpkg/tlpobj/pst-jtree.tlpobj
--- old/tlpkg/tlpobj/pst-jtree.tlpobj 2016-04-14 19:37:21.000000000 +0200
+++ new/tlpkg/tlpobj/pst-jtree.tlpobj 2017-04-14 17:56:17.000000000 +0200
@@ -11,7 +11,7 @@
RELOC/tex/generic/pst-jtree/pst-jtree.tex
RELOC/tex/latex/pst-jtree/pst-jtree.sty
catalogue-ctan /graphics/pstricks/contrib/pst-jtree
-catalogue-date 2015-08-15 05:39:34 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics linguistic tree pstricks
catalogue-version 2.6
++++++ pst-knot.doc.tar.xz ++++++
++++++ pst-knot.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-knot.tlpobj new/tlpkg/tlpobj/pst-knot.tlpobj
--- old/tlpkg/tlpobj/pst-knot.tlpobj 2016-04-14 19:37:21.000000000 +0200
+++ new/tlpkg/tlpobj/pst-knot.tlpobj 2017-04-14 17:56:17.000000000 +0200
@@ -10,7 +10,7 @@
RELOC/tex/generic/pst-knot/pst-knot.tex
RELOC/tex/latex/pst-knot/pst-knot.sty
catalogue-ctan /graphics/pstricks/contrib/pst-knot
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics decoration pstricks
catalogue-version 0.2
++++++ pst-labo.doc.tar.xz ++++++
++++++ pst-labo.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-labo.tlpobj new/tlpkg/tlpobj/pst-labo.tlpobj
--- old/tlpkg/tlpobj/pst-labo.tlpobj 2016-04-14 19:37:23.000000000 +0200
+++ new/tlpkg/tlpobj/pst-labo.tlpobj 2017-04-14 17:56:18.000000000 +0200
@@ -12,7 +12,7 @@
RELOC/tex/generic/pst-labo/pst-laboObj.tex
RELOC/tex/latex/pst-labo/pst-labo.sty
catalogue-ctan /graphics/pstricks/contrib/pst-labo
-catalogue-date 2015-12-10 13:07:27 +0100
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics chemistry graphics-use
catalogue-version 2.04
++++++ pst-layout.doc.tar.xz ++++++
++++++ pst-layout.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-layout.tlpobj new/tlpkg/tlpobj/pst-layout.tlpobj
--- old/tlpkg/tlpobj/pst-layout.tlpobj 2016-04-14 19:37:24.000000000 +0200
+++ new/tlpkg/tlpobj/pst-layout.tlpobj 2017-04-14 17:56:18.000000000 +0200
@@ -10,7 +10,7 @@
runfiles size=3
RELOC/tex/latex/pst-layout/pst-layout.sty
catalogue-ctan /graphics/pstricks/contrib/pst-layout
-catalogue-date 2015-08-15 05:39:34 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics layout table pstricks
catalogue-version .95
++++++ pst-lens.doc.tar.xz ++++++
++++++ pst-lens.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-lens.tlpobj new/tlpkg/tlpobj/pst-lens.tlpobj
--- old/tlpkg/tlpobj/pst-lens.tlpobj 2016-04-14 19:37:24.000000000 +0200
+++ new/tlpkg/tlpobj/pst-lens.tlpobj 2017-04-14 17:56:18.000000000 +0200
@@ -10,7 +10,7 @@
RELOC/tex/generic/pst-lens/pst-lens.tex
RELOC/tex/latex/pst-lens/pst-lens.sty
catalogue-ctan /graphics/pstricks/contrib/pst-lens
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics optics pstricks
catalogue-version 1.02
++++++ pst-light3d.doc.tar.xz ++++++
++++++ pst-light3d.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-light3d.tlpobj new/tlpkg/tlpobj/pst-light3d.tlpobj
--- old/tlpkg/tlpobj/pst-light3d.tlpobj 2016-04-14 19:37:25.000000000 +0200
+++ new/tlpkg/tlpobj/pst-light3d.tlpobj 2017-04-14 17:56:18.000000000 +0200
@@ -12,7 +12,7 @@
RELOC/tex/latex/pst-light3d/pst-light3d.sty
catalogue-also xkeyval
catalogue-ctan /graphics/pstricks/contrib/pst-light3d
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics graphics-3d graphics-use pstricks
catalogue-version 0.12
++++++ pst-magneticfield.doc.tar.xz ++++++
++++++ pst-magneticfield.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-magneticfield.tlpobj new/tlpkg/tlpobj/pst-magneticfield.tlpobj
--- old/tlpkg/tlpobj/pst-magneticfield.tlpobj 2016-04-14 19:37:27.000000000 +0200
+++ new/tlpkg/tlpobj/pst-magneticfield.tlpobj 2017-04-14 17:56:19.000000000 +0200
@@ -13,7 +13,7 @@
RELOC/tex/generic/pst-magneticfield/pst-magneticfield.tex
RELOC/tex/latex/pst-magneticfield/pst-magneticfield.sty
catalogue-ctan /graphics/pstricks/contrib/pst-magneticfield
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics physics pstricks
catalogue-version 1.13
++++++ pst-math.doc.tar.xz ++++++
++++++ pst-math.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-math.tlpobj new/tlpkg/tlpobj/pst-math.tlpobj
--- old/tlpkg/tlpobj/pst-math.tlpobj 2016-04-14 19:37:27.000000000 +0200
+++ new/tlpkg/tlpobj/pst-math.tlpobj 2017-04-14 17:56:19.000000000 +0200
@@ -19,7 +19,7 @@
RELOC/tex/generic/pst-math/pst-math.tex
RELOC/tex/latex/pst-math/pst-math.sty
catalogue-ctan /graphics/pstricks/contrib/pst-math
-catalogue-date 2015-08-15 05:39:34 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics maths calculation pstricks
catalogue-version 0.63
++++++ pst-mirror.doc.tar.xz ++++++
/work/SRC/openSUSE:Factory/texlive-specs-s/pst-mirror.doc.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-s.new/pst-mirror.doc.tar.xz differ: char 27, line 1
++++++ pst-mirror.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-mirror.tlpobj new/tlpkg/tlpobj/pst-mirror.tlpobj
--- old/tlpkg/tlpobj/pst-mirror.tlpobj 2016-04-14 19:37:32.000000000 +0200
+++ new/tlpkg/tlpobj/pst-mirror.tlpobj 2017-04-14 17:56:22.000000000 +0200
@@ -11,7 +11,7 @@
RELOC/tex/generic/pst-mirror/pst-mirror.tex
RELOC/tex/latex/pst-mirror/pst-mirror.sty
catalogue-ctan /graphics/pstricks/contrib/pst-mirror
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics graphics-use pstricks
catalogue-version 1.01
++++++ pst-node.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-node/Changes new/doc/generic/pst-node/Changes
--- old/doc/generic/pst-node/Changes 2016-04-25 23:48:45.000000000 +0200
+++ new/doc/generic/pst-node/Changes 2017-01-23 00:01:02.000000000 +0100
@@ -1,4 +1,7 @@
----- pst-node.tex
+1.39 2017-01-20 - fix for \Circlenode with +/+\dp\hbox
+1.38 2016-05-27 - revert fix for \Cnodeput. Problem was in pstricks.tex
+1.37 2016-05-26 - fixed bug with \Cnodeput
1.36 2016-04-24 - moved node definitions from pstricks-add
1.35 2014-08-04 - added \saveDataAsNodes{Filename}{NodePrefix}
1.34 2014-06-17 - fix bug for showNodes
Binary files old/doc/generic/pst-node/psmatrix-docDE.pdf and new/doc/generic/pst-node/psmatrix-docDE.pdf differ
Binary files old/doc/generic/pst-node/pst-node-doc.pdf and new/doc/generic/pst-node/pst-node-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-node/pst-node-doc.tex new/doc/generic/pst-node/pst-node-doc.tex
--- old/doc/generic/pst-node/pst-node-doc.tex 2016-04-25 23:48:45.000000000 +0200
+++ new/doc/generic/pst-node/pst-node-doc.tex 2017-01-23 00:01:02.000000000 +0100
@@ -1,13 +1,13 @@
-%% $Id: pst-node-doc.tex 66 2014-08-04 19:10:10Z herbert $
+%% $Id: pst-node-doc.tex 295 2016-05-02 19:11:36Z herbert $
\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
headexclude,footexclude,oneside]{pst-doc}
\listfiles
+\input{pst-node}
+\let\pstFV\fileversion
+
\usepackage[utf8]{inputenc}
\usepackage{pst-plot}
-\usepackage{pst-node}
-%\usepackage{pax}
-\let\pstFV\fileversion
\let\belowcaptionskip\abovecaptionskip
%
\newcommand\xstrut{\vphantom{\tabular{c}Üg\\Üg\endtabular}}
@@ -16,7 +16,7 @@
\def\bgImage{%
\psscalebox{0.85}{%
\begin{pspicture}(-1,-1)(21,7)
-\psset{framearc=0.2,shadow=true,fillstyle=solid,shadowcolor=black!55}
+\psset{framearc=0.2,shadow,fillstyle=solid,shadowcolor=black!55}
\psBox[blue!30]{7,6}{politische\\Kommunikation}
\psBox[red!30]{3,4}{interpersonale\\Kommunikation}
\psBox[red!30]{13,4}{massenmediale\\Kommunikation}
@@ -39,7 +39,7 @@
\newbox\filebox
\setbox\filebox=\hbox{%
\pspicture(-1,-.5)(1,.7)
- \pspolygon[linearc=2pt,shadow=true,shadowangle=45,xunit=1.1]%
+ \pspolygon[linearc=2pt,shadow,shadowangle=45,xunit=1.1]%
(-1,-.55)(-1,.5)(-.8,.5)(-.8,.65)(-.2,.65)(-.2,.5)(1,.5)(1,-.55)
\endpspicture}
@@ -406,7 +406,7 @@
top center, top right) of the \Lenv{pspicture} box.
\begin{LTXexample}[width=6cm,wide=false]
-\begin{pspicture}[showgrid=true](-1,-1)(4,4)
+\begin{pspicture}[showgrid](-1,-1)(4,4)
\psDefPSPNodes
\psdots(PSPbl)(PSPbc)(PSPbr)
(PSPcl)(PSPcc)(PSPcr)(PSPtl)(PSPtc)(PSPtr)
@@ -1349,7 +1349,7 @@
\psset{arrows=->,nodesep=3pt}
\everypsbox{\scriptstyle}
\ncline{1,1}{2,2}_{y}
- \ncline[doubleline=true,linestyle=dashed]{-}{1,1}{2,3}^{x}
+ \ncline[doubleline,linestyle=dashed]{-}{1,1}{2,3}^{x}
\ncline{2,2}{3,2}<{q}
\ncline{2,2}{2,3}_{p}
\ncline{2,3}{3,3}>{f}
@@ -1683,7 +1683,7 @@
using the macro \Lcs{psGetNodeCenter}.
\begin{LTXexample}[width=5cm]
-\begin{pspicture}[showgrid=true,arrowscale=2](5,5)
+\begin{pspicture}[showgrid,arrowscale=2](5,5)
\pnode(4.5,0.5){MyNode}
\psdot(MyNode)
\pnode(! \psGetNodeCenter{MyNode}
@@ -1694,7 +1694,7 @@
\end{LTXexample}
\begin{LTXexample}[width=5cm]
-\begin{pspicture}[showgrid=true](5,5)
+\begin{pspicture}[showgrid](5,5)
\rput(1.5,0.5){\trinode{CN}{NodeA}}
\rput(3.5,2.5){\trinode{EN}{NodeB}}
\pnode(! \psGetNodeCenter{CN}
@@ -1705,7 +1705,7 @@
\end{LTXexample}
-The coordinates of the nodes can also be saved with \Lkeyset{saveNodeCoors=true} in global defined names
+The coordinates of the nodes can also be saved with \Lkeyword{saveNodeCoors} in global defined names
\texttt{N-<name>.x} and \texttt{N-<name>.y}. With the optional argument \Lkeyword{NodeCoorPrefix}, which is
by default empty, the name setting can be changed to \texttt{<NodeCoorPrefix><name>x} and \texttt{<NodeCoorPrefix><name>y}.
@@ -2009,7 +2009,7 @@
\begin{LTXexample}[width=5cm]
-\begin{pspicture}[showgrid=true](5,3)
+\begin{pspicture}[showgrid](5,3)
\psset{linecolor=black}
\psline[linestyle=dashed]{->}(3,1.5)
\psline[linestyle=dashed]{->}(0.375,1.5)
@@ -2151,7 +2151,7 @@
and \Lcs{midAB}\verb|(Q)(P){Q}|.
\begin{LTXexample}[width=.35\textwidth]
-\begin{pspicture}[showgrid=true](-.5,-.5)(2.5,2.5)
+\begin{pspicture}[showgrid](-.5,-.5)(2.5,2.5)
\psset{arrows=->,arrowscale=1.5}
\pnode(2,1){P}\pnode(.5,1){Q}
\AtoB(Q)(P){QP}
@@ -2191,7 +2191,7 @@
The expression in \texttt{t} in this case is algebraic, which is detected automatically by the macro.
\begin{LTXexample}[width=.35\textwidth]
-\begin{pspicture}[showgrid=true](-.5,-.5)(2.5,2)
+\begin{pspicture}[showgrid](-.5,-.5)(2.5,2)
\def\exn{cos(t) | sin(t)}
\psparametricplot[algebraic]{0}{2}{\exn}
\curvepnode{1}{\exn}{P}
@@ -2226,7 +2226,7 @@
\verb|<tmin>, <tmax>| may be expressed using PostScript---eg, \verb|{Pi neg}{PiDiv2}|.
\begin{LTXexample}[width=.35\textwidth]
-\begin{pspicture}[showgrid=true](-.5,-.5)(2.5,3)
+\begin{pspicture}[showgrid](-.5,-.5)(2.5,3)
\def\exn{t+t^2 | 2*Ex(-t)}
\psset{plotpoints=100}
\psparametricplot[algebraic]{0}{1}{\exn}
@@ -2256,7 +2256,7 @@
\Lcs{fnpnode}\verb|[algebraic]{0.5}{x*(x+1)/2}{P}|.
\begin{LTXexample}[width=.35\textwidth]
-\begin{pspicture}[showgrid=true](-.5,-.5)(2.5,3)
+\begin{pspicture}[showgrid](-.5,-.5)(2.5,3)
\def\exn{x x 1 add mul 2 div}
\psplot{0}{2}{\exn}
\fnpnode{0.5}{\exn}{Q}
@@ -2274,7 +2274,7 @@
must be specified if your expression is indeed algebraic.
\begin{LTXexample}[width=.35\textwidth]
-\begin{pspicture}[showgrid=true](-.5,-.5)(2.5,3)
+\begin{pspicture}[showgrid](-.5,-.5)(2.5,3)
\def\exn{x x 1 add mul 2 div}
\psplot{0}{2}{\exn}
\fnpnodes[plotpoints=10]{0}{2}{\exn}{A}
@@ -2314,7 +2314,7 @@
\begin{LTXexample}[width=.35\textwidth]
-\begin{pspicture}[showgrid=true,algebraic](-.5,-.5)(2.5,2)
+\begin{pspicture}[showgrid,algebraic](-.5,-.5)(2.5,2)
\pnodes{P}(.1,.1)(1;10)(*2 {x^2/4})(0,1.4)
%defines P0..P3--now join them
\psnline[arrowscale=2]{-D>}(0,3){P}
@@ -2331,7 +2331,7 @@
\end{verbatim}
\begin{LTXexample}[width=.35\textwidth]
-\begin{pspicture}[showgrid=true,algebraic](-.5,-.5)(2.5,2)
+\begin{pspicture}[showgrid,algebraic](-.5,-.5)(2.5,2)
\pnodes{P}(.1,.1)(1;10)(*2 {x^2/4})(0,1.4)
%defines P0..P3--now join them
\psncurve[arrowscale=2]{-D>}(0,3){P}
@@ -2340,7 +2340,7 @@
\vspace{2pc}
\begin{LTXexample}[width=.35\textwidth]
-\begin{pspicture}[showgrid=true,algebraic](-.5,-.5)(2.5,2)
+\begin{pspicture}[showgrid,algebraic](-.5,-.5)(2.5,2)
\pnodes{P}(.1,.1)(1;10)(*2 {x^2/4})(0,1.4)
%defines P0..P3--now join them
\psnccurve[arrowscale=2]{-D>}(0,3){P}
@@ -2361,10 +2361,14 @@
\begin{verbatim}
\psLCNodeVar(A)(B)(a,b){C}
\end{verbatim}
+
+\begin{sloppypar}
does the same, but the third argument \verb|(a,b)| may be specified in any form acceptable
to \Lcs{SpecialCoor}. (With \Lcs{psLCNode}, each coefficient may be specified in PostScript code.)
One other difference is that \Lcs{psLCNodeVar} allows the reuse of a node name in place. For example,
it is possible to write
+\end{sloppypar}
+
\begin{verbatim}
\psLCNodeVar(A)(B)(2,3){A}% symbol A reassigned
\end{verbatim}
@@ -2382,14 +2386,17 @@
\begin{verbatim}
\psRelNode[angle=30](A)(B){2}{C}
\end{verbatim}
- but the third argument (2;30) may be specified in any form acceptable to \Lcs{SpecialCoor},
- while specifying the angle argument in \Lcs{psRelNode} using PostScript is not possible.
- Note that \Lcs{psRelNodeVar}\verb|(0,0)(A)(B){C}| may be interpreted as defining \texttt{C} to
- be the complex product of \texttt{A} and \texttt{B}.
+
+\begin{sloppypar}
+but the third argument (2;30) may be specified in any form acceptable to \Lcs{SpecialCoor},
+while specifying the angle argument in \Lcs{psRelNode} using PostScript is not possible.
+Note that \Lcs{psRelNodeVar}\verb|(0,0)(A)(B){C}| may be interpreted as defining \texttt{C} to
+be the complex product of \texttt{A} and \texttt{B}.
+\end{sloppypar}
\begin{LTXexample}[width=5cm]
-\begin{pspicture}[showgrid=true](-.5,-.5)(3.5,3)
+\begin{pspicture}[showgrid](-.5,-.5)(3.5,3)
\pnode(0,.5){P}\pnode(1.5,.75){Q}
\psRelNodeVar(P)(Q)(2;20){R}
\psline(Q)(P)\uput[-45](P){P}
@@ -2403,7 +2410,8 @@
\begin{BDef}
\Lcs{psRelLineVar}\Largr{node A}\Largr{node B}\Largr{radius;angle}\Largb{node name}
\end{BDef}
- stands to \Lcs{psRelLine} as \Lcs{psRelNodeVar} stands relative to \Lcs{psRelNode}.
+
+stands to \Lcs{psRelLine} as \Lcs{psRelNodeVar} stands relative to \Lcs{psRelNode}.
\Lcs{psRelLine}\verb|Var(A)(B)(a;b){C}| defines the node \texttt{C}, and, in addition, draws the line segment \texttt{AC}.
@@ -2423,7 +2431,7 @@
\begin{LTXexample}[width=.35\textwidth]
-\begin{pspicture}[showgrid=true](-.5,-.5)(3.5,3)
+\begin{pspicture}[showgrid](-.5,-.5)(3.5,3)
\pnode(0,.5){P}\pnode(1,1){Q}
\psrline{->}(P)(Q)(2;20)
\uput[-45](P){P}
@@ -2437,7 +2445,7 @@
line from \verb|<basept>+<nodexpr1>| to \verb|<basept>+<nodexpr2>|.
\begin{LTXexample}[width=.35\textwidth]
-\begin{pspicture}[showgrid=true](-.5,-.5)(3.5,4)
+\begin{pspicture}[showgrid](-.5,-.5)(3.5,4)
\def\pfn{t | t^2/4}
\psparametricplot[algebraic]{0}{3.5}{\pfn}
\curvepnode{2}{\pfn}{P}% sets P, Ptang
@@ -2490,7 +2498,7 @@
\begin{LTXexample}[width=.375\textwidth]
-\begin{pspicture}[showgrid=true](-.5,-.5)(3.5,3)
+\begin{pspicture}[showgrid](-.5,-.5)(3.5,3)
\pnodes{P}(0,.5)(3,.5)(2.5,2)(.5,2.5)(0,.5)
\pnode(1,1.1){A}\pnode(2,1.5){B}
\polyIntersections{N1}{N2}(A)(B){P}{4}
@@ -2502,7 +2510,7 @@
\end{LTXexample}
\begin{LTXexample}[width=.375\textwidth]
-\begin{pspicture}[showgrid=true](-.5,-.5)(3.5,3)
+\begin{pspicture}[showgrid](-.5,-.5)(3.5,3)
\pnodes{P}(0,.5)(3,.5)(2.5,2)(.5,2.5)(0,.5)
\pnode(1,1.1){A}\pnode(2,3){B}
\polyIntersections{N1}{N2}(A)(B){P}{4}
@@ -2514,7 +2522,7 @@
\end{LTXexample}
\begin{LTXexample}[width=.375\textwidth]
-\begin{pspicture}[showgrid=true](-.5,-.5)(3.5,3)
+\begin{pspicture}[showgrid](-.5,-.5)(3.5,3)
\def\fn{1.5+sin(t)+.4*sin(2*t)%
| 1+cos(t)+.2*cos(2*t)+.2*sin(4*t)}%
\pnode(1,1.1){A}\pnode(2,1.2){B}
@@ -2532,7 +2540,7 @@
\begin{LTXexample}[width=.375\textwidth]
-\begin{pspicture}[showgrid=true](-.5,-.5)(3.5,3)
+\begin{pspicture}[showgrid](-.5,-.5)(3.5,3)
\def\fn{1.5+sin(t)+.4*sin(2*t)%
| 1+cos(t)+.2*cos(2*t)+.2*sin(4*t)}%
\pnode(.8,.6){A}\pnode(2.5,-.5){B}
@@ -2549,7 +2557,7 @@
\begin{LTXexample}[width=.375\textwidth]
-\begin{pspicture}[showgrid=true](-.5,-.5)(3.5,3)
+\begin{pspicture}[showgrid](-.5,-.5)(3.5,3)
\pnodes{P}(0,.5)(3,.5)(2.5,2)(.5,2.5)(0,.5)
\pnode(1,1.1){A}\pnode(2,1.5){B}
\polyIntersections{N1}{N2}(A)(B){P}{3}
@@ -2564,7 +2572,7 @@
\vspace{1pc}
\begin{LTXexample}[width=.375\textwidth]
-\begin{pspicture}[showgrid=true](-.5,-.5)(3.5,3)
+\begin{pspicture}[showgrid](-.5,-.5)(3.5,3)
\def\func{x+sin(2*x)}
\psplot[algebraic]{0}{3.14}{\func}
\fnpnodes[algebraic]{0}{3.14}{\func}{P}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-node.doc.tlpobj new/tlpkg/tlpobj/pst-node.doc.tlpobj
--- old/tlpkg/tlpobj/pst-node.doc.tlpobj 2016-04-26 03:17:28.000000000 +0200
+++ new/tlpkg/tlpobj/pst-node.doc.tlpobj 2017-04-14 17:56:22.000000000 +0200
@@ -1,13 +1,12 @@
name pst-node.doc
category Package
-revision 40743
+revision 43015
shortdesc doc files of pst-node
relocated 1
-docfiles size=237
+docfiles size=184
RELOC/doc/generic/pst-node/Changes
RELOC/doc/generic/pst-node/README
RELOC/doc/generic/pst-node/psmatrix-docDE.bib
- RELOC/doc/generic/pst-node/psmatrix-docDE.pdf
RELOC/doc/generic/pst-node/psmatrix-docDE.tex
RELOC/doc/generic/pst-node/pst-node-doc.bib
RELOC/doc/generic/pst-node/pst-node-doc.pdf
++++++ pst-node.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dvips/pst-node/pst-node.pro new/dvips/pst-node/pst-node.pro
--- old/dvips/pst-node/pst-node.pro 2014-08-07 00:50:05.000000000 +0200
+++ new/dvips/pst-node/pst-node.pro 2017-01-23 00:01:05.000000000 +0100
@@ -7,7 +7,7 @@
%% of the LaTeX Project Public License Distributed from CTAN archives
%% in directory macros/latex/base/lppl.txt.
%
-%%%% EMPTY lines are not aload!!! Problem with pst-eps -> \par
+%%%% EMPTY lines are not alowed!!! Problem with pst-eps -> \par
%
%
tx@Dict begin % from main pstricks dict
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dvips/pst-node/pst-node97.pro new/dvips/pst-node/pst-node97.pro
--- old/dvips/pst-node/pst-node97.pro 2011-07-29 16:12:10.000000000 +0200
+++ new/dvips/pst-node/pst-node97.pro 2017-01-23 00:01:05.000000000 +0100
@@ -1,4 +1,5 @@
%!
+% $Id: pst-node97.pro 68 2014-08-07 10:16:26Z herbert $
% PostScript prologue for pst-node.tex.
% Created 1993/3/12. Source file was pst-node.doc
% Version 0.93a, 93/03/12.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/pst-node/pst-node.tex new/tex/generic/pst-node/pst-node.tex
--- old/tex/generic/pst-node/pst-node.tex 2016-04-25 23:48:45.000000000 +0200
+++ new/tex/generic/pst-node/pst-node.tex 2017-01-23 00:01:06.000000000 +0100
@@ -1,4 +1,4 @@
-% $Id: pst-node.tex 68 2014-08-07 10:16:26Z herbert $
+% $Id: pst-node.tex 373 2017-01-20 14:30:39Z herbert $
%%
%% BEGIN pst-node.tex
%%
@@ -18,8 +18,8 @@
\ifx\PSTricksLoaded\endinput\else\input pstricks.tex \fi\relax
\ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi
%
-\def\fileversion{1.36}
-\def\filedate{2016/04/24}
+\def\fileversion{1.39}
+\def\filedate{2017/01/20}
\message{ v\fileversion, \filedate}
%
\edef\TheAtCode{\the\catcode`\@}
@@ -148,8 +148,8 @@
\def\pst@nodealign{%
\pst@dimg=\ht\pst@hbox
-\advance\pst@dimg-\dp\pst@hbox
-\divide\pst@dimg2
+\advance\pst@dimg by -\dp\pst@hbox
+\divide\pst@dimg by \tw@
\lower\pst@dimg}
%
\def\tx@InitPnode{InitPnode }
@@ -195,10 +195,7 @@
\fi
\pscircle@do(#1){#2}%
\pst@newnode{#3}{11}{\pst@coor \pst@number\pst@dimc}{\tx@InitCnode}%
-%% % DG/SR modification begin - Jul. 30, 1997 - Patch 2
-%% %\ifPst@nodealign \kern\pst@dimc\egroup \fi}%
\ifPst@nodealign\kern\pst@dimc\fi%
-%% % DG/SR modification end
}%
\ignorespaces}
%
@@ -210,32 +207,36 @@
\def\cnodeput@i{\@ifnextchar({\cnodeput@iii}{\cnodeput@ii}}
\def\cnodeput@ii#1{%
\addto@par{rot={#1}}%
- \@ifnextchar({\cnodeput@iii}{\cnodeput@iii(\z@,\z@)}}
+ \@ifnextchar({\cnodeput@iii}{\cnodeput@iii(\z@,\z@)}%
+}
\def\cnodeput@iii(#1)#2{%
\pst@killglue
\@fixedradiusfalse
\def\pst@nodehook{\cnodeput@iv{#2}}%
- \pst@makebox{\cput@v{#1}}}
+ \pst@makebox{\cput@v{#1}}%
+}
\def\cnodeput@iv#1{%
\pst@newnode{#1}{11}{\pscirclebox@iv \pst@number\pslinewidth add}{\tx@InitCnode}%
- \global\let\pst@nodehook\relax}
-%
+ \global\let\pst@nodehook\relax
+ \ignorespaces
+}
\def\Cnodeput{\pst@object{Cnodeput}}
\def\Cnodeput@i{\@ifnextchar({\Cnodeput@iii}{\Cnodeput@ii}}
\def\Cnodeput@ii#1{%
-\addto@par{rot={#1}}%
-\@ifnextchar({\Cnodeput@iii}{\Cnodeput@iii(\z@,\z@)}}
+ \addto@par{rot={#1}}%
+ \@ifnextchar({\Cnodeput@iii}{\Cnodeput@iii(\z@,\z@)}}
\def\Cnodeput@iii(#1)#2{%
-\pst@killglue
-\@fixedradiustrue
-\def\pst@nodehook{\Cnodeput@iv{#2}}%
-\pst@makebox{\cput@v{#1}}}
+ \pst@killglue
+ \@fixedradiustrue
+ \def\pst@nodehook{\Cnodeput@iv{#2}}%
+ \pst@makebox{\cput@v{#1}}%
+}
\def\Cnodeput@iv#1{%
-\pst@newnode{#1}{11}{%
-\pst@number{\wd\pst@hbox} 2 div \pst@number\pst@dima % x y
-\pst@number\pst@dimb \pst@number\pslinewidth \psk@dimen .5 sub mul sub }% r
-{\tx@InitCnode}%
-\global\let\pst@nodehook\relax}
+ \pst@newnode{#1}{11}{%
+ \pst@number{\wd\pst@hbox} 2 div \pst@number\pst@dima % x y
+ \pst@number\pst@dimb \pst@number\pslinewidth \psk@dimen .5 sub mul sub }% r
+ {\tx@InitCnode}%
+ \global\let\pst@nodehook\relax}
%
\def\circlenode{\pst@object{circlenode}}
\def\circlenode@i#1{\pst@makebox{\circlenode@ii{#1}}}
@@ -257,21 +258,21 @@
\def\Circlenode@i#1{\pst@makebox{\Circlenode@ii{#1}}}
\def\Circlenode@ii#1{%
\begingroup
-\pst@useboxpar
-\pst@dima=\ht\pst@hbox
-\advance\pst@dima\dp\pst@hbox
-\divide\pst@dima\tw@
-\pssetlength\pst@dimb\psk@radius
-\setbox\pst@hbox=\hbox{%
-\Cnodeput@iv{#1}%
-\pscircle(.5\wd\pst@hbox,\pst@dima){\pst@dimb}%
-\box\pst@hbox}%
-\ifPst@nodealign \psboxseptrue \fi
-\ifpsboxsep \psCirclebox@sep \fi
-\leavevmode
-\ifPst@nodealign\pst@nodealign\fi
-\box\pst@hbox
-\endgroup}
+ \pst@useboxpar
+ \pst@dima=\ht\pst@hbox
+ \advance\pst@dima by -\dp\pst@hbox
+ \divide\pst@dima by \tw@
+ \pssetlength\pst@dimb\psk@radius
+ \setbox\pst@hbox=\hbox{%
+ \Cnodeput@iv{#1}%
+ \pscircle(.5\wd\pst@hbox,\pst@dima){\pst@dimb}%
+ \box\pst@hbox}%
+ \ifPst@nodealign \psboxseptrue \fi
+ \ifpsboxsep \psCirclebox@sep \fi
+ \leavevmode
+ \ifPst@nodealign\pst@nodealign\fi
+ \box\pst@hbox
+ \endgroup}
\def\tx@GetRnodePos{GetRnodePos }
\def\tx@InitRnode{InitRnode }
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/pst-node/pst-node97.tex new/tex/generic/pst-node/pst-node97.tex
--- old/tex/generic/pst-node/pst-node97.tex 2013-09-19 00:21:57.000000000 +0200
+++ new/tex/generic/pst-node/pst-node97.tex 2017-01-23 00:01:06.000000000 +0100
@@ -1,3 +1,4 @@
+% $Id: pst-node97.tex 129 2014-10-09 14:15:40Z herbert $
%% BEGIN: pst-node.tex
%% Generated on <1993/3/12> from `pst-node.doc'.
%% For use with the PostScript header file `pst-node.pro'.
@@ -27,11 +28,11 @@
\csname PSTnodesLoaded\endcsname
\let\PSTnodesLoaded\endinput
\ifx\PSTricksLoaded\endinput\else
-\def\next{\input pstricks.tex}\expandafter\next
+\def\next{\input pstricks97.tex}\expandafter\next
\fi
\edef\TheAtCode{\the\catcode`\@}
\catcode`\@=11
-\pstheader{pst-node.pro}
+\pstheader{pst-node97.pro}
\def\pst@nodedict{tx@NodeDict begin }
\def\pst@getnode#1#2{%
\pst@expandafter\pst@@getnode{#1} * \@nil{#1}#2}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-node.tlpobj new/tlpkg/tlpobj/pst-node.tlpobj
--- old/tlpkg/tlpobj/pst-node.tlpobj 2016-04-26 03:17:29.000000000 +0200
+++ new/tlpkg/tlpobj/pst-node.tlpobj 2017-04-14 17:56:22.000000000 +0200
@@ -1,6 +1,6 @@
name pst-node
category Package
-revision 40743
+revision 43015
shortdesc Nodes and node connections in PSTricks
relocated 1
longdesc The package enables the user to connect information, and to
@@ -18,7 +18,7 @@
RELOC/tex/generic/pst-node/pst-node97.tex
RELOC/tex/latex/pst-node/pst-node.sty
catalogue-ctan /graphics/pstricks/contrib/pst-node
-catalogue-date 2016-04-25 09:50:38 +0200
+catalogue-date 2017-01-21 23:14:28 +0100
catalogue-license lppl
catalogue-topics graphics-in-tex linguistic
-catalogue-version 1.36
+catalogue-version 1.39
++++++ pst-ob3d.doc.tar.xz ++++++
++++++ pst-ob3d.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-ob3d.tlpobj new/tlpkg/tlpobj/pst-ob3d.tlpobj
--- old/tlpkg/tlpobj/pst-ob3d.tlpobj 2016-04-14 19:37:34.000000000 +0200
+++ new/tlpkg/tlpobj/pst-ob3d.tlpobj 2017-04-14 17:56:22.000000000 +0200
@@ -11,7 +11,7 @@
RELOC/tex/generic/pst-ob3d/pst-ob3d.tex
RELOC/tex/latex/pst-ob3d/pst-ob3d.sty
catalogue-ctan /graphics/pstricks/contrib/pst-ob3d
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics graphics-3d pstricks
catalogue-version 0.21
++++++ pst-ode.doc.tar.xz ++++++
++++++ pst-ode.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-ode.tlpobj new/tlpkg/tlpobj/pst-ode.tlpobj
--- old/tlpkg/tlpobj/pst-ode.tlpobj 2016-04-14 19:37:34.000000000 +0200
+++ new/tlpkg/tlpobj/pst-ode.tlpobj 2017-04-14 17:56:23.000000000 +0200
@@ -17,7 +17,7 @@
RELOC/tex/generic/pst-ode/pst-ode.tex
RELOC/tex/latex/pst-ode/pst-ode.sty
catalogue-ctan /graphics/pstricks/contrib/pst-ode
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics maths graphics-plot
catalogue-version 0.7
++++++ pst-optexp.doc.tar.xz ++++++
++++++ pst-optexp.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-optexp.tlpobj new/tlpkg/tlpobj/pst-optexp.tlpobj
--- old/tlpkg/tlpobj/pst-optexp.tlpobj 2016-04-14 19:37:41.000000000 +0200
+++ new/tlpkg/tlpobj/pst-optexp.tlpobj 2017-04-14 17:56:25.000000000 +0200
@@ -15,7 +15,7 @@
RELOC/makeindex/pst-optexp/pst-optexp.ist
RELOC/tex/latex/pst-optexp/pst-optexp.sty
catalogue-ctan /graphics/pstricks/contrib/pst-optexp
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics optics diagram-lab pstricks
catalogue-version 5.2
++++++ pst-optic.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-optic/Changes new/doc/generic/pst-optic/Changes
--- old/doc/generic/pst-optic/Changes 2010-09-13 18:36:21.000000000 +0200
+++ new/doc/generic/pst-optic/Changes 2016-11-25 19:27:50.000000000 +0100
@@ -1,4 +1,5 @@
---- pst-optic.tex
+1.02 2016-07-10 - added option onlyrays, preset to false
1.01 2010-07-23 - bugfixes for \psset[pst-optic,pstricks]
1.00 2009-02-10 - new style opticalAxis to allow different line styles
- cosmetic changes to the code and the documentation
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-optic/README new/doc/generic/pst-optic/README
--- old/doc/generic/pst-optic/README 2010-09-13 18:36:21.000000000 +0200
+++ new/doc/generic/pst-optic/README 2016-11-25 19:27:50.000000000 +0100
@@ -1,9 +1,9 @@
%% Package `pst-optic.tex'
%%
%% Manuel Luque (France)
-%% Herbert Voss (Germany)
+%% Herbert Voss (Germany)
%%
-%% 2003-02-16
+%% 2016-07-10
%%
Save the files
@@ -15,7 +15,7 @@
If you like to get the documentation file in another format run
latex pst-optic-doc.tex
-bibtex pst-optic.doc
+biber pst-optic.doc
latex pst-optic-doc.tex
dvips pst-optic-doc.dvi
@@ -23,11 +23,3 @@
files are saved in the above mentioned way, before you run
latex on the documentation file.
-It is nearly the same for the example file pst-optic-examples.tex
-
-
-The intermediate DVI file works only with viewers which can
-interprete the embedded PostScript code, like the one from KDE.
-
-For another PDF output read the Introduction from
-the documentation.
Binary files old/doc/generic/pst-optic/more_docs/dtk.pdf and new/doc/generic/pst-optic/more_docs/dtk.pdf differ
Binary files old/doc/generic/pst-optic/more_docs/pst-optic-examples.pdf and new/doc/generic/pst-optic/more_docs/pst-optic-examples.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-optic/more_docs/pst-optic-examples.tex new/doc/generic/pst-optic/more_docs/pst-optic-examples.tex
--- old/doc/generic/pst-optic/more_docs/pst-optic-examples.tex 2010-09-13 18:36:21.000000000 +0200
+++ new/doc/generic/pst-optic/more_docs/pst-optic-examples.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,653 +0,0 @@
-%% $Id: pst-func-doc.tex 64 2008-12-08 22:14:27Z herbert $
-\documentclass[11pt,english,BCOR10mm,DIV13,bibliography=totoc,parskip=false,smallheadings
- headexclude,footexclude,oneside]{pst-doc}
-\usepackage[utf8]{inputenc}
-\usepackage{pst-optic,pst-text}
-\usepackage{hyperref}
-\let\pstOpticFV\fileversion
-\lstset{pos=t,wide=true,language=PSTricks,basicstyle=\footnotesize\ttfamily}
-\let\belowcaptionskip\abovecaptionskip
-%
-\begin{document}
-
-\title{\texttt{pst-optic}}
-\subtitle{Lenses and Mirrors -- examples; v.\pstOpticFV}
-
-\author{Manuel Luque \\Herbert Vo\ss}
-\docauthor{Herbert Vo\ss}
-\date{\today}
-\maketitle
-
-\tableofcontents
-
-\clearpage
-
-\part{Lenses}
-\section{A simple colored System}
-
-\begin{itemize}
-\item $\mathrm{\overline{AB} = 2\ cm}$
-\item $\mathrm{\overline{OA} = -10\ cm}$
-\item $\mathrm{\overline{OF'} = 3,333\ cm}$
-\item $\mathrm{\overline{XO} = 2\ cm}$
-\end{itemize}
-
-\begin{LTXexample}
-\begin{pspicture}(-8.5,-3)(8.5,3)
-\rput(0,0){\lens[focus=3.333,OA=-10,AB=2,XO=2,xLeft=-8.5,xRight=8.5,rayColor=red]}
-\pnode(!XO 2.5){L1} \pnode(!XO -2.5){L2}
-\psOutLine[length=2](L1)(B'){END} \psBeforeLine[length=2](B')(L2){START}
-\pspolygon[style=rayuresJaunes,linestyle=none](B)(L1)(END)(START)(L2)
-\rput(0,0){\lens[focus=3.333,OA=-10,AB=2,XO=2,xLeft=-8.5,xRight=8.5,rayColor=red,arrowsize=0.2]}
-\end{pspicture}
-\end{LTXexample}
-\xLcs{psOutLine}\xLcs{psBeforeLine}
-
-\clearpage
-\section{A Magnifier}
-
-\begin{LTXexample}
-\begin{pspicture}(-8,-5)(8,3)
-\rput(0,0){\lens[lensGlass=true,lensWidth=0.4,focus=4,AB=0.5,OA=-2.8,XO=2,drawing=false]
- \psline[linewidth=0.5pt](xLeft)(xRight)}
-\pnode(!XO 2.5){L1} \pnode(!XO -2.5){L2}
-\psOutLine[length=5.5,linestyle=none](B')(L1){END1}
-\psBeforeLine[length=6,linestyle=none](L2)(B'){START}
-\pspolygon[style=rayuresJaunes,linestyle=none](B)(L1)(END1)(START)(L2)
-\psline[linewidth=1.5\pslinewidth,arrowinset=0]{->}(A)(B)
-\uput[270](A){A} \uput[90](B){B}
-\psline[linewidth=1.5\pslinewidth,arrowinset=0,linestyle=dashed]{->}(A')(B')
-\uput[270](A'){$\mathrm{A'}$} \uput[90](B'){$\mathrm{B'}$}
-\psset{linecolor=red,arrowsize=0.2}
-\pcline[nodesepB=-4](B)(O)% Mittelpunktstrahl
-\psline[linecolor=red,linestyle=dashed](B)(B')% ruckwaertige Verlaengerung
-\Arrows(B)(O)% Mittelpunktstrahl
-\psOutLine[length=2,arrows=->](B)(O){END6}% Mittelpunktstrahl
-\psline(B)(I)(F')\psOutLine(I)(F'){END2}\Arrows(I)(F')\Arrows(B)(I)
-\psOutLine[length=1,linestyle=dashed](I')(B'){END3}
-\psline[linestyle=dashed](B)(F)\psline(B)(I')\Arrows[arrows=->>](B)(I')
-\psline[linestyle=dashed](B')(I')\psline[linestyle=dashed](B')(I)
-\psOutLine[length=2,arrows=->>](B')(I'){END4}\psOutLine[length=4](B')(I'){END5}
-\rput(8,0){\psset{linecolor=black}\eye}
-\end{pspicture}
-\end{LTXexample}
-\xLcs{psOutLine}\xLcs{psBeforeLine}\xLcs{eye}\xLcs{lens}\xLcs{Arrows}
-
-\clearpage
-\section{Two Lenses}
-
-This is a simple system with two lenses, where the \Lcs{lens} macro is used only once.
-The second lense (the left one) is drawn by the \Lcs{psline} macro.
-
-\begin{LTXexample}
-\begin{pspicture}(-8,-5)(8,3)
-\rput(0,0){\lens[lensScale=0.6,drawing=false,focus=1.5,OA=-1,XO=5,nameF={},nameFi={},AB=-1]
- \psline[linewidth=1pt](xLeft)(xRight)} %image intermediaire A1B1 au foyer F'1
-\psline{->}(4,0)(4,-1) %lentille 2
-% \psline[linewidth=2\pslinewidth,linecolor=blue]{<->}(5,1.5)(5,-1.5)
-%On place les points essentiels
-\pnode(-6,0){O1} \pnode(-6,2.5){E1L1} \pnode(-6,-2.5){E2L1}
-\pnode(4,0){A1} \pnode(4,-1){B1}
-\rayInterLens(O1)(B1){5}{Inter1L2}%intersection de O1 avec la lentille L2
-\pcline[nodesepB=-2](Inter1L2)(O1)%rayon venant de l'infini jusqu'e la lentille L2
-\Parallel(B1)(O1)(E1L1){B1infty}%rayon parallele au precedent et passant par E1L1
-\Parallel(B1)(O1)(E2L1){B2infty}%rayon passant par E2L2
-%intersection de la droite passant par E1L1 et B1 avec la lentille L2
-\rayInterLens(E1L1)(B1){5}{InterE1B1L2}\psline(E1L1)(InterE1B1L2)
-%intersection de la droite passant par E2L2 et B1 avec la lentille L2
-\rayInterLens(E2L1)(B1){5}{InterE2B1L2}
-\psline(E2L1)(InterE2B1L2)
-\psline[linestyle=dashed]{->}(A')(B')\psline[linestyle=dashed](InterE1B1L2)(B')
-\psline[linestyle=dashed](InterE2B1L2)(B')\psline[linestyle=dotted](B')(O)
-\psOutLine[length=3](B')(InterE1B1L2){END}\psBeforeLine[length=3](InterE2B1L2)(B'){START}
-\pspolygon[style=rayuresJaunes,linestyle=none](B1infty)(E1L1)(InterE1B1L2)%
- (END)(START)(InterE2B1L2)(E2L1)(B2infty)
-\uput[90](A'){$\mathrm{A'}$}\uput[270](B'){$\mathrm{B'}$}
-\uput[90](A1){$\mathrm{A_1}$}\uput[270](B1){$\mathrm{B_1}$}
-\uput[225](O1){O1}\uput[45](O){O2}\uput[90](F){$\mathrm{F_2}$}
-\uput{0.4}[150](F'){$\mathrm{F'_2}$}\uput{0.6}[90](A1){$\mathrm{F'_1}$}
-\psline[linecolor=red](B1infty)(E1L1)(InterE1B1L2)(END)
-\psline[linecolor=red](B2infty)(E2L1)(InterE2B1L2)(START)
-\rput(8,0){\eye}
-\psline[linewidth=2\pslinewidth,linecolor=blue,arrowsize=0.2,arrowinset=0.5]{<->}(-6,-2.5)(-6,2.5)
-\end{pspicture}
-\end{LTXexample}
-\xLcs{psOutLine}\xLcs{psBeforeLine}\xLcs{eye}\xLcs{lens}\xLcs{Arrows}\xLcs{rayInterLens}
-
-\clearpage
-\section{Real Image}
-
-\begin{LTXexample}
-\begin{pspicture*}(-7.5,-3)(7.5,3)
-\rput(0,0){\lens[lensGlass=true,lensWidth=0.5,lensType=DVG,XO=0,AB=2,OA=-4,focus=-6,spotAi=270,spotBi=90]%
- \psline[linewidth=1pt](xLeft)(xRight)}
-\psline[linecolor=red,linestyle=dashed](I')(F)% Verlaengerung des Brennstrahls
-\psOutLine[length=7](B')(I){END}\psBeforeLine[length=7](I')(B'){START}% permet de definir START
-\pspolygon[style=rayuresJaunes,linestyle=none](B)(I)(END)(START)(I')
-\psline(B)(I)(END) \psline(B)(I')(START)
-\end{pspicture*}
-\end{LTXexample}
-\xLcs{psOutLine}\xLcs{psBeforeLine}\xLcs{lens}
-
-\clearpage
-\section{Virtual Image}
-
-\begin{LTXexample}
-\begin{pspicture*}(-7.5,-6.5)(7.5,7.5)
-\rput(0,0){\lens[lensType=DVG,lensWidth=0.75,lensHeight=7,focus=-2,OA=-6,AB=4,XO=-1,lensGlass=true,
- rayColor=red,yBottom=-5,yTop=5,drawing=false]
- \psline[linewidth=1pt](xLeft)(xRight)}
-\pnode(!XO 2.9){L1} \pnode(!XO -2.5){L2}
-{ \psset{length=4,linestyle=none}
- \psOutLine(B')(L1){A1} \psOutLine(B')(L2){A2}
- \pspolygon[style=rayuresJaunes,linestyle=none](B)(L1)(A1)(A2)(L2)
- \psset{linecolor=red,linestyle=solid}
- \psline(B)(L1)(A1) \psline(B)(L2)(A2) \psline[linestyle=dashed](B')(L1)
- \psline[linestyle=dashed](B')(L2) }
-\psline[linestyle=dashed]{->}(A)(B) \psline{->}(A')(B')
-\uput[90](B){B}\uput[90](B'){$\mathrm{B'}$}\uput[270](A){A}\uput[270](A'){$\mathrm{A'}$}
-\end{pspicture*}
-\end{LTXexample}
-\xLcs{psOutLine}\xLcs{psBeforeLine}\xLcs{lens}
-
-\clearpage
-\section{A Microscope}
-
-\begin{LTXexample}
-\begin{pspicture}(-7.5,-5.5)(7.5,3)
-\rput(0,0){\lens[focus=1.5,OA=-2,AB=0.5,XO=-5,lensGlass=true,lensWidth=0.4,
- yBottom=-4,yTop=4,drawing=false,lensScale=0.4,nameF=F_1,nameFi=F'_1]
- \psline[linewidth=1pt](xLeft)(xRight)}
-\pnode(! XO 1){UPlens1} \pnode(! XO -1){DOWNlens1}
-\Transform
-\rput(0,0){\lens[focus=2,XO=3,lensGlass=true,lensWidth=0.4,yBottom=-4,yTop=4,drawing=false,
- nameF=F_2,nameFi=F'_2,spotF=90,spotFi=90]}
-\psline{->}(A1)(B1)\psline{->}(A'1)(B'1)\uput[270](A1){A}\uput[90](B1){B}
-\uput[270](B'1){$\mathrm{B_1}$}\uput{0.7}[90](A'1){$\mathrm{A_1}$}
-{\psset{linecolor=red}
- \rayInterLens(I11)(B'1){3}{Inter1L2}\rayInterLens(B1)(O1){3}{Inter2L2}
- \rayInterLens(UPlens1)(B'1){3}{Inter3L2}\rayInterLens(DOWNlens1)(B'1){3}{Inter4L2}
- \psline(B1)(I11)(B'1)(Inter1L2)\psline(B1)(Inter2L2)\psline(B1)(UPlens1)(Inter3L2)
- \psline(B1)(DOWNlens1)(Inter4L2)
- \psset{length=5}
- \Parallel(B'1)(O)(Inter3L2){B1inftyRigth}\Parallel(B'1)(O)(Inter4L2){B2inftyRigth}
- \Parallel(B'1)(O)(Inter2L2){B3inftyRigth}\Parallel(B'1)(O)(Inter1L2){B3inftyRigth}
- {\psset{length=-5,linestyle=dashed}
- \Parallel(B'1)(O)(Inter3L2){B1inftyLeft}\Parallel(B'1)(O)(Inter4L2){B2inftyLeft}
- \Parallel(B'1)(O)(Inter2L2){B3inftyLeft}\Parallel(B'1)(O)(Inter1L2){B3inftyLeft}
- \pcline[nodesep=6](B'1)(O)}
- \pspolygon[style=rayuresJaunes,linestyle=none](B1)(UPlens1)(Inter3L2)%
- (B1inftyRigth)(B2inftyRigth)(Inter4L2)(DOWNlens1)
- \psline(B1)(UPlens1)(Inter3L2)(B1inftyRigth)\psline(B2inftyRigth)(Inter4L2)(DOWNlens1)(B1)}
-\rput(7,0){\eye}
-\end{pspicture}%
-\end{LTXexample}
-\xLcs{psOutLine}\xLcs{psBeforeLine}\xLcs{lens}\xLcs{rayInterLens}\xLcs{Parallel}
-
-
-\clearpage
-\section{Telescope}
-
-\begin{LTXexample}[wide=false]
-\telescope[mirrorFocus=10,posMirrorTwo=8,yBottom=-8]
-\end{LTXexample}
-
-\xLcs{telescope}
-\begin{LTXexample}[wide=false]
-\telescope[mirrorFocus=6,posMirrorTwo=5,yBottom=-5]
-\end{LTXexample}
-
-\clearpage
-\section{Lightspeed measured by Foucault}
-1849 Foucault (1819-1868) determines with the following configuration the speed of the light.
-
-
-
-\begin{LTXexample}
-\begin{pspicture}(-8,-3.2)(7,4.5)
-\rput(0,0){\lens[lensWidth=1,lensGlass=true,lensHeight=6,focus=4,drawing=false,AB=2.5]}
-{\psset{linewidth=0.5pt,linestyle=dashed,arrowsize=5pt,arrows=|<->|}
- \psline(-8,0)(4,0)\pcline(-7.75,-3)(0,-3)\lput*{:U}{2f}
- \pcline(0,-3)(4,-3)\lput*{:U}{f}\pcline(7,0)(7,4)\lput*{:U}{f}
- \pcline(4,5)(5,5)\lput*{:U}{s}\pcline(5.25,2.3)(5.25,2.8)\lput*{:U}{s} }
-\uput[90](0,3){\Large L}\uput[45](-7.7,3){\Large B}\uput[45](-7.7,-2){\Large E}
-\uput[270](3,-0.5){\Large D}\uput[-45](4,0){\Large A=F}\uput[270](3,2){\Large S}
-\uput[90](4,4){\Large Sp}\uput[90](3.5,3.25){\Large B'}\uput[0](6.3,2.25){\Large B''}
-\uput[-90](6,1.1){\Large M}\psarc[linewidth=0.5pt](-7.75,2.5){0.5}{-90}{0}\qdisk(-7.55,2.3){1pt}
-\rput{210}(F'){\mirrorTwo}
-{\psset{fillstyle=solid,fillcolor=lightgray}
- \rput{210}(4,2.5){\psframe(-1,0)(1,0.2)}\psframe(-8,-3)(-7.75,3)
- \psframe(3,4)(3.8,4.2)\psframe(4.2,4)(5,4.2) }
-{\psset{linewidth=1pt,linecolor=red,arrows=->,arrowsize=5pt}
- \arrowLine[linecolor=blue,arrowOffset=-0.2](F')(4,2.5){2}
- \arrowLine[linecolor=blue,arrowOffset=-0.2](4,2.3)(6,2.3){1}
- \qdisk(6,2.3){2pt}
- \psline[linestyle=dashed,arrows=-](F')(5.1,4)\psline[linestyle=dashed,arrows=-](5,2.8)(6,2.8)
- \arrowLine(4,4)(F'){3}\arrowLine[linecolor=blue,arrowOffset=-0.2](I)(F'){2}
- \arrowLine(F')(I){2}\arrowLine[linecolor=blue,arrowOffset=-0.3](-7.75,2.5)(I){3}
- \arrowLine(I)(-7.75,2.5){3} }
-\psframe(5.5,1.1)(6.5,3.5)
-\multido{\r=1.3+0.2}{12}{\psline(6.1,\r)(6.5,\r)}
-\end{pspicture}
-\end{LTXexample}
-
-Sp chink; \\
-D rotating mirror;\\
-L collecting lens;\\
-E end mirror;\\
-S half diaphanous mirror;\\
-M scale
-
-
-\clearpage
-\part{Mirrors}
-
-\section{High Beam Light\label{beamlight}}
-\begin{LTXexample}
-\begin{pspicture}(-1.5,-5.5)(10,5.5)
-\rput(0,0){\beamLight[drawing=false,mirrorDepth=4.75,mirrorWidth=0.1,mirrorHeight=10,linecolor=lightgray]}
-\makeatletter
-\pst@getcoor{Focus}\pst@tempf
-\psset{linewidth=1pt,linecolor=red}
-\multido{\n=60+5}{18}{%
- \mirrorCVGRay[linecolor=red,mirrorDepth=4.75,mirrorHeight=10,linewidth=1pt](Focus)(!%
- /XF \pst@tempf pop \pst@number\psxunit div def \n\space cos XF add \n\space sin neg){Endd1}
- \psOutLine[arrows=->,length=.25](Endd1)(Endd1''){Endd2}%
- \mirrorCVGRay[linecolor=red,mirrorDepth=4.75,mirrorHeight=10,linewidth=1pt](Focus)(!%
- /XF \pst@tempf pop \pst@number\psxunit div def \n\space cos XF add \n\space sin ){End1}
- \psOutLine[arrows=->,length=.25](End1)(End1''){End2}}
-\makeatletter
-\end{pspicture}
-\end{LTXexample}
-\xLcs{beamLight}\xLcs{mirrorCVGRay}\xLcs{psOutLine}
-\clearpage
-\section{Low Beam Light}
-
-
-\begin{LTXexample}
-\begin{pspicture}(-1.5,-5)(10,5)
-\rput(0,0){\beamLight[drawing=false,mirrorDepth=4.75,mirrorWidth=0.1,mirrorHeight=10,linecolor=lightgray]}
-\psset{linewidth=1pt,linecolor=red}
-\multido{\n=70+5}{20}{%
- \psline(2.75,-0.2)(! \n\space cos 2.75 add \n\space sin )
- \mirrorCVGRay[linecolor=red,mirrorDepth=4.75,mirrorHeight=10,linewidth=1pt](2.75,-0.2)%
- (! \n\space cos 2.75 add \n\space sin ){End1}
- \psOutLine[arrows=->,length=.25](End1)(End1''){End2}}
-\end{pspicture}
-\end{LTXexample}
-\xLcs{beamLight}\xLcs{mirrorCVGRay}\xLcs{psOutLine}\xLkeyword{mirrorDepth}\xLkeyword{mirrorHeight}
-
-
-
-\clearpage
-\part{Refraction}
-
-\section{Vertical Medium}
-
-Refrectionnumbers are $n_1=1$ and $n_2=1.5$:
-
-\begin{LTXexample}
-\begin{pspicture}[showgrid=true](-5,-3)(5,3)
-\pnode(-1,-2.5){A}\pnode(1,-2.5){B}\pnode(1,2.5){C}\pnode(-1,2.5){D}
-% \rotateFrame(A)(B)(C)(D){10}
-\uput[-135](A){A}\uput[-45](B){B}\uput[45](C){C}\uput[135](D){D}
-\pspolygon[fillcolor=lightgray,fillstyle=solid,linecolor=blue](A)(B)(C)(D)
-% 1.
-\refractionRay(-3,-3)(-2,-2)(D)(A){1}{1.5}{END}
-\psset{linecolor=red,linewidth=2pt,arrowsize=5pt,arrows=->}
-\arrowLine(-3,-3)(END){2}\ABinterCD(END)(END')(C)(B){Out}
-\arrowLine(END)(Out){1}\refractionRay(END)(Out)(C)(B){1.5}{1}{Q}
-\arrowLine(Q)(Q'){1}\psOutLine[length=2](Q)(Q'){End}
-% 2.
-\refractionRay(-3,0)(-2,0)(A)(D){1}{1.5}{END}
-\psset{linecolor=green,linewidth=2pt,arrowsize=5pt,arrows=->}
-\arrowLine(-3,0)(END){2}\ABinterCD(END)(END')(C)(B){Out}
-\arrowLine(END)(Out){1}\refractionRay(END)(Out)(C)(B){1.5}{1}{Q}
-\arrowLine(Q)(Q'){1}\psOutLine[length=2](Q)(Q'){End}
-% 3.
-\refractionRay(-3,3)(-2,2)(D)(A){1}{1.5}{END}
-\psset{linecolor=blue,linewidth=2pt,arrowsize=5pt,arrows=->}
-\arrowLine(-3,3)(END){2}\ABinterCD(END)(END')(C)(B){Out}
-\arrowLine(END)(Out){1}\refractionRay(END)(Out)(C)(B){1.5}{1}{Q}
-\arrowLine(Q)(Q'){1}\psOutLine[length=2](Q)(Q'){End}
-\end{pspicture}
-\end{LTXexample}
-\xLcs{refractionRay}\xLcs{arrowLine}\xLcs{ABinterCD}\xLkeyword{length}
-
-\clearpage
-\section{Horizontal Medium}
-Refrectionnumbers are $n_1=1$ and $n_2=1.5$:
-
-\begin{LTXexample}
-\begin{pspicture}[showgrid=true](-5,-4)(5,3)
-\pnode(-2.5,-1){A}\pnode(2.5,-1){B}\pnode(2.5,1){C}\pnode(-2.5,1){D}
-%\rotateFrame(A)(B)(C)(D){10}
-\uput[-135](A){A}\uput[-45](B){B}\uput[45](C){C}\uput[135](D){D}
-\pspolygon[fillcolor=lightgray,fillstyle=solid,linecolor=blue](A)(B)(C)(D)
-% 1.
-\refractionRay(-3,3)(-2,2)(C)(D){1}{1.5}{END}
-\psset{linecolor=red,linewidth=2pt,arrowsize=5pt,arrows=->}
-\arrowLine(-3,3)(END){2}\ABinterCD(END)(END')(B)(A){Out}
-\arrowLine(END)(Out){1}\refractionRay(END)(Out)(B)(A){1.5}{1}{Q}
-\arrowLine(Q)(Q'){1}\psOutLine[length=2](Q)(Q'){End}
-% 2.
-\refractionRay(0,3)(0,1)(C)(D){1}{1.5}{END}
-\psset{linecolor=green,linewidth=2pt,arrowsize=5pt,arrows=->}
-\arrowLine(0,3)(END){2}\ABinterCD(END)(END')(A)(B){Out}
-\arrowLine(END)(Out){1}\refractionRay(END)(Out)(B)(A){1.5}{1}{Q}
-\arrowLine(Q)(Q'){1}\psOutLine[length=2](Q)(Q'){End}
-% 3.
-\refractionRay(3,3)(2,2)(C)(D){1}{1.5}{END}
-\psset{linecolor=blue,linewidth=2pt,arrowsize=5pt,arrows=->}
-\arrowLine(3,3)(END){2}\ABinterCD(END)(END')(B)(A){Out}
-\arrowLine(END)(Out){1}\refractionRay(END)(Out)(B)(A){1.5}{1}{Q}
-\arrowLine(Q)(Q'){1}\psOutLine[length=2](Q)(Q'){End}
-\end{pspicture}
-\end{LTXexample}
-\xLcs{refractionRay}\xLcs{arrowLine}\xLcs{ABinterCD}
-
-\clearpage
-
-\section{Parallel Rays and a sloping medium}
-Refrectionnumbers are $n_1=1$ and $n_2=1.5$:
-
-\begin{LTXexample}
-\begin{pspicture}[showgrid=true](-7,-1)(5,6)
-\pnode(0,0){A}\pnode(2,0){B}\pnode(2,5){C}\pnode(0,5){D}
-\rotateFrame(A)(B)(C)(D){40}
-\uput[-135](A){A}\uput[-45](B){B}\uput[30](C){C}\uput[135](D){D}
-\pspolygon[fillcolor=lightgray,fillstyle=solid,linecolor=blue](A)(B)(C)(D)
-\psset{linecolor=red,linewidth=2pt,arrowsize=5pt,arrows=->}
-\multido{\r=1.10+0.28}{8}{%
- \refractionRay(-6.00,\r)(-3.00,\r)(A)(D){1}{1.5}{End}
- \arrowLine(-6.00,\r)(End){2}\ABinterCD(End)(End')(C)(B){Out}
- \arrowLine(End)(Out){1}\refractionRay(End)(Out)(C)(B){1.5}{1}{Q}
- \psline(Q)(Q')\psOutLine[length=3](Q)(Q'){End}}
-\end{pspicture}
-\end{LTXexample}
-\xLcs{refractionRay}\xLcs{arrowLine}\xLcs{ABinterCD}\xLcs{polygon}
-
-\clearpage
-
-\section{A Prisma}
-Refrectionnumbers are $n_1=1$ and $n_2=1.5$:
-
-
-\begin{LTXexample}
-\begin{pspicture}[showgrid=true](-7,0)(5,6)
-\pnode(-3,1){A}\pnode(1,1){B}\pnode(-1,5){C}\uput[-135](A){A}\uput[-45](B){B}\uput[30](C){C}
-\pspolygon[fillcolor=lightgray,fillstyle=solid,linecolor=blue](A)(B)(C)
-\psset{linecolor=red,linewidth=2pt,arrowsize=5pt,arrows=->}
-\multido{\rA=0.6+0.2,\rB=1.5+0.2}{7}{%
- \refractionRay(-6,\rA)(-4,\rB)(C)(A){1}{1.5}{END}\arrowLine(-6,\rA)(END){2}
- \ABinterCD(END)(END')(C)(B){Out}\arrowLine(END)(Out){1}
- \refractionRay(END)(Out)(C)(B){1.5}{1}{Q}\psline(Q)(Q')\psOutLine[length=3](Q)(Q'){End}}
-\end{pspicture}
-\end{LTXexample}
-\xLcs{refractionRay}\xLcs{arrowLine}\xLcs{ABinterCD}\xLcs{psOutLine}
-
-
-\section{A Prisma for Dispersion}
-The following figure shows the light dispersion with realistic values for the refractions numbers of the different light colors.
-\bigskip
-
-\begin{tabular}{ @{}l l l l l l @{}}
- & darkblue & bluegreen & yellow & red & darkred \\
-$n$ for glass & 1.528 & 1.523 & 1.517 & 1.514 & 1.511
-\end{tabular}
-
-\begin{landscape}
-\begin{LTXexample}[wide=false]
-\begin{pspicture}[showgrid=true](-7,0)(14,6)
-\pnode(-6,1){A}\pnode(-2,1){B}\pnode(-4,5){C}\uput[-135](A){A}\uput[-45](B){B}\uput[30](C){C}
-\pnode(12.5,0.5){E1}\pnode(12.5,5.5){E2}
-\psframe[fillcolor=lightgray,fillstyle=solid](E1)(12.75,5.5)\pspolygon[fillcolor=lightgray,fillstyle=solid,linecolor=blue](A)(B)(C)
-\psset{linecolor=black,linewidth=2pt,arrowsize=5pt,arrows=->}
-\pnode(-7,1){P1}\pnode(-6,2){P2}\ABinterCD(P1)(P2)(C)(A){END}\arrowLine(P1)(END){2}
-\psset{linecolor=blue,linewidth=0.5pt,arrowsize=2pt,}
-\refractionRay(P1)(P2)(C)(A){1}{1.528}{END}\ABinterCD(END)(END')(C)(B){Out}\arrowLine(END)(Out){1}
-\refractionRay(END)(Out)(C)(B){1.528}{1}{Q}\psline(Q)(Q')\ABinterCD(Q)(Q')(E1)(E2){END}\arrowLine(Q)(END){4}\qdisk(END){1.5pt}
-\psset{linecolor=green}
-\refractionRay(P1)(P2)(C)(A){1}{1.523}{END}\ABinterCD(END)(END')(C)(B){Out}\arrowLine(END)(Out){1}
-\refractionRay(END)(Out)(C)(B){1.523}{1}{Q}\psline(Q)(Q')\ABinterCD(Q)(Q')(E1)(E2){END}\arrowLine(Q)(END){4}\qdisk(END){1.5pt}
-\psset{linecolor=yellow}
-\refractionRay(P1)(P2)(C)(A){1}{1.517}{END}\ABinterCD(END)(END')(C)(B){Out}\arrowLine(END)(Out){1}
-\refractionRay(END)(Out)(C)(B){1.517}{1}{Q}\psline(Q)(Q')\ABinterCD(Q)(Q')(E1)(E2){END}\arrowLine(Q)(END){4}\qdisk(END){1.5pt}
-\psset{linecolor=red}
-\refractionRay(P1)(P2)(C)(A){1}{1.511}{END}\ABinterCD(END)(END')(C)(B){Out}\arrowLine(END)(Out){1}
-\refractionRay(END)(Out)(C)(B){1.511}{1}{Q}\psline(Q)(Q')\ABinterCD(Q)(Q')(E1)(E2){END}\arrowLine(Q)(END){4}\qdisk(END){1.5pt}
-\end{pspicture}
-\end{LTXexample}
-\end{landscape}
-
-
-\clearpage
-\section{Refration with different Angles}
-Refrectionnumbers are $n_1=1$ and $n_2=1.5$:
-
-\begin{LTXexample}
-\begin{pspicture}[showgrid=true](-6,-5)(6,5)
-\pnode(-6,-1){A}\pnode(6,-1){B}\pnode(6,1){C}\pnode(-6,1){D}
-\uput[-135](A){A}\uput[-45](B){B}\uput[30](C){C}\uput[135](D){D}
-\pspolygon[fillcolor=lightgray,fillstyle=solid,linecolor=blue](A)(B)(C)(D)
-\psline[linewidth=0.5pt](0,-5)(0,5)
-\psset{linecolor=red,linewidth=1.5pt,arrowsize=5pt,arrows=->}
-\multido{\n=30+5}{25}{%
- \refractionRay(5;\n)(0,1)(C)(D){1}{1.5}{END}\arrowLine(5;\n)(END){2}
- \ABinterCD(END)(END')(B)(A){Out}\arrowLine(END)(Out){1}
- \refractionRay(END)(Out)(B)(A){1.5}{1}{Q}\psline(Q)(Q')\psOutLine[length=3](Q)(Q'){End}}
-\end{pspicture}
-\end{LTXexample}
-
-
-
-
-
-\clearpage
-\section{Great difference in the Refractionsnumbers}
-
-Refrectionnumbers are $n_1=1$ and $n_2=4$:
-
-
-\begin{LTXexample}
-\begin{pspicture}[showgrid=true](-5,-1)(2,6)
-\pnode(0,0){A}\pnode(2,0){B}\pnode(2,5){C}\pnode(0,5){D}\rotateFrame(A)(B)(C)(D){45}
-\uput[-135](A){A}\uput[-40](B){B}\uput[45](C){C}\uput[135](D){D}
-\pspolygon[fillcolor=lightgray,fillstyle=solid,linecolor=blue](A)(B)(C)(D)
-\refractionRay(-2.5,-1)(-2,1)(A)(D){1}{4}{END}
-\psset{linecolor=red,linewidth=2pt,arrowsize=5pt,arrows=->}
-\arrowLine(-2.5,-1)(END){2}\ABinterCD(END)(END')(C)(B){Out}\arrowLine(END)(Out){1}
-\refractionRay(END)(Out)(C)(B){4}{1}{Q}\arrowLine(Q)(Q'){1}\psOutLine[length=2](Q)(Q'){End}
-\end{pspicture}
-\end{LTXexample}
-
-
-\clearpage
-
-\section{Total Reflection}
-
-Refrectionnumbers are $n_1=2$ and $n_2=1$:
-
-\begin{LTXexample}
-\begin{pspicture}[showgrid=true](-8,-3)(8,6)
-\pnode(-8,1.5){A}\pnode(8,1.5){B}\uput[45](A){A}\uput[135](B){B}\pnode(0,0){START}
-\psframe[fillcolor=lightgray,fillstyle=solid,linecolor=blue](-8,-1.5)(B)
-\psset{linecolor=red,linewidth=1.5pt,arrowsize=5pt,arrows=->}
-% \multido{\n=20+5}{16}{%
-\multido{\n=20+5}{29}{%
- \refractionRay(START)(1;\n)(A)(B){1.5}{1}{END}\arrowLine(START)(END){2}
- \arrowLine(END)(END'){1}\psOutLine[length=3](END)(END'){Q}\arrowLine(END')(Q){3}}
-\end{pspicture}
-\end{LTXexample}
-
-\clearpage
-
-
-\section{Total Reflection with a sloping medium}
-
-Refrectionnumbers are $n_1=2$ and $n_2=1$:
-
-
-\begin{LTXexample}
-\begin{pspicture}[showgrid=true](-8,-6)(8,6)
-\pnode(-6,1.5){A}\pnode(6,1.5){B}\pnode(6,-1.5){C}\pnode(-6,-1.5){D}
-\rotateFrame(A)(B)(C)(D){30}\uput[90](A){A}\uput[135](B){B}\pnode(0,0){START}
-\pspolygon[fillcolor=lightgray,fillstyle=solid,linecolor=blue](A)(B)(C)(D)
-\psset{linecolor=red,linewidth=1.5pt,arrowsize=5pt,arrows=->}
-\multido{\n=50+5}{29}{%
- \refractionRay(START)(1;\n)(A)(B){2}{1}{END}\arrowLine(START)(END){2}
- \arrowLine(END)(END'){1}\psOutLine[length=3](END)(END'){Q}\arrowLine(END')(Q){3}}
-\end{pspicture}
-\end{LTXexample}
-
-\clearpage
-
-\part{Spherical Optic}
-
-
-\section{Refraction at a Spherical Surface}
-
-\subsection[Simple Example]{Construction for finding the position of the image point P' of a point object P formed by refraction at a sperical surface}
-
-
-\begin{LTXexample}
-\begin{pspicture*}[showgrid=true](-10,-4)(3,4)
-\rput(0,0){\lensSPH[lensType=CVG,lensHeight=12,lensWidth=10,yBottom=-6,yTop=6,xLeft=-6,xRight=6,drawing=false]}
-\psset{linecolor=red,linewidth=1.5pt,dotstyle=|}
-\pnode(-9,0){P}\psdots(P)\uput[-90](P){P}\psline(P)(xRight)\lensSPHRay(P)(-5,2){1}{9}{Q}
-\psline(P)(Q)(Q')\psdots(Q)\uput[90](Q){B}\ABinterCD(Q)(Q')(0,0)(5,0){P'}
-\psdots(Q')\uput[-90](P'){P'}\psline[linewidth=0.5pt,linecolor=black](Center')(Q)
-\psline[linewidth=0.5pt,linecolor=black](Q)(Q|0,0)\psdots(Center')\uput[-90](Center'){C}
-\end{pspicture*}
-\end{LTXexample}
-\xLcs{lensSPH}\xLcs{lensSPHRay}\xLcs{ABinterCD}
-
-
-\clearpage
-\subsection[Height of an Image]{Construction for determining the height of an image formed by refraction at a sperical surface}
-
-\begin{LTXexample}
-\begin{pspicture*}[showgrid=true](-13,-3)(3,5)
-\rput(0,0){\lensSPH[lensType=CVG,lensHeight=12,lensWidth=10,yBottom=-4,yTop=4,xLeft=-5,xRight=5,drawing=false]}
-\psset{linecolor=red,linewidth=1.5pt,dotstyle=|}
-\pnode(-12,0){P}\psdots(P)\uput[-90](P){P}\pnode(-12,4){Q}\psdots(Q)\uput[90](Q){Q}
-\psline[linecolor=blue,linewidth=3pt,arrows=->](P)(Q)\psline(P)(xRight)
-\lensSPHRay(Q)(Center'){1}{9}{S1}\lensSPHRay(Q)(-5,0){1}{9}{S2}%
-\psline(Q)(S1')\psline(Q)(S2)(S2')\ABinterCD(Q)(S1')(S2)(S2'){Q'}
-\pnode(Q'|0,0){P'}\psline[linecolor=blue,linewidth=3pt,arrows=->](P')(Q')
-\uput[90](P'){P'}\uput[-90](Q'){Q'}\psdots(Center')\uput[90](Center'){C}
-\end{pspicture*}
-\end{LTXexample}
-\xLcs{lensSPH}\xLcs{lensSPHRay}\xLcs{ABinterCD}
-
-
-\clearpage
-\section{Thin Convergent Lenses}
-
-If the two spherical surfaces are close enough we can call such a lense a
-\textbf{thin lens}. The following figure shows the behaviour of such a lense with real rays.
-
-\begin{LTXexample}
-\psset{xunit=0.75cm}
-\begin{pspicture*}[showgrid=true](-10,-4)(10,4)
-\rput(0,0){\lensSPH[lensType=CVG,lensHeight=7,lensWidth=1.25,yBottom=-5,yTop=5,xLeft=-12,xRight=12,%
- AB=2,OA=-9,refractA=1,refractB=2,drawing=true,rayColor=red]}
-\end{pspicture*}
-\end{LTXexample}
-\xLkeyword{refractA}\xLkeyword{refractB}\xLkeyset{lensType=CVG}\xLkeyword{AB}
-
-\clearpage
-
-\section{Thick Convergent Lenses}
-
-There is no real image possible.
-
-\begin{LTXexample}
-\begin{pspicture}(-10,-4)(10,4)
-\rput(0,0){\lensSPH[lensType=CVG,lensHeight=7,lensWidth=2,yBottom=-5,yTop=5,xLeft=-12,xRight=12,%
- AB=2,OA=-9,refractA=1,refractB=2,drawing=true,rayColor=red]}
-\end{pspicture}
-\end{LTXexample}
-\xLkeyword{refractA}\xLkeyword{refractB}\xLkeyset{lensType=CVG}\xLkeyword{AB}
-
-
-\clearpage
-
-\section{Thin Divergent Lenses}
-If the two spherical surfaces are close enough we can call such a lense a \textbf{thin lens}. The following figure shows the behaviour of such a lense with real rays.
-
-\psset{unit=1cm}
-\begin{LTXexample}
-\begin{pspicture*}[showgrid=true](-6,-3)(6,3)
-\rput(0,0){\lensSPH[lensType=DVG,lensWidth=0.1,lensDepth=0.2,AB=1,OA=-5,drawing=true,rayColor=red]}
-\end{pspicture*}
-\end{LTXexample}
-\xLcs{lensSPH}\xLkeyset{lensType=DVG}\xLkeyword{AB}
-
-
-\clearpage
-
-\section{Thick Divergent Lenses}
-
-There is no real image possible.
-
-\begin{LTXexample}
-\begin{pspicture*}[showgrid=true](-6,-3)(6,3)
-\rput(0,0){\lensSPH[lensType=DVG,lensWidth=1,lensDepth=1,AB=1,OA=-5,drawing=true,rayColor=red]}
-\end{pspicture*}
-\end{LTXexample}
-\xLcs{lensSPH}\xLkeyset{lensType=DVG}\xLkeyword{AB}
-
-\clearpage
-\section{\nxLcs{mirrorCVG}}
-
-\begin{LTXexample}
-\begin{pspicture*}[showgrid=true](-1,-5)(8,5)
-\rput(0,0){\mirrorCVG[mirrorType=SPH,drawing=false,yBottom=-4,yTop=4,mirrorHeight=8,mirrorDepth=3]
- \qdisk(Center){2pt}\qdisk(Focus){2pt}
- \uput[-90](Center){Center}\uput[-90](Focus){F}\psline(O)(xRight)}
-\multido{\rA=-3.50+0.25}{5}{%
- \mirrorCVGRay[mirrorType=SPH,linecolor=red](6,\rA)(4,\rA){E}
- \psOutLine[linecolor=red,length=4](E')(E''){EEnd}}
-\multido{\rA=-2.25+0.25}{19}{%
- \ABinterSPHLens(6,\rA)(4,\rA)(Center){Ptemp}
- \reflectionRay[mirrorType=SPH](5,\rA)(Ptemp){E}
- \psline[linecolor=red](6,\rA)(Ptemp)(E)\psOutLine[linecolor=red,length=6](Ptemp)(E){EEnd}}
-\multido{\rA=2.50+0.25}{5}{%
- \mirrorCVGRay[mirrorType=SPH,linecolor=red](6,\rA)(4,\rA){E}
- \psOutLine[linecolor=red,length=4](E')(E''){EEnd}}
-\end{pspicture*}
-\end{LTXexample}
-\xLcs{mirrorCVG}\xLkeyset{mirrorType=SPH}\xLcs{ABinterSPHLens}\xLcs{refractionRay}
-
-
-\clearpage
-\section{\nxLcs{mirrorDVG}}
-
-
-\begin{LTXexample}
-\begin{pspicture*}[showgrid=true](-5,-5)(8,5)
-\rput(0,0){%
- \mirrorDVG[mirrorType=SPH,drawing=false,yBottom=-4,yTop=4,mirrorHeight=8,mirrorWidth=0.25,mirrorDepth=2.5]
- \qdisk(Center){2pt}\qdisk(Focus){2pt}\uput[-90](Center){C}\uput[-90](Focus){F}
- \psline(xLeft)(xRight)}
-\multido{\rA=-3.00+0.25}{25}{%
- \ABinterSPHLens(7,\rA)(4,\rA)(Center){Ptemp}\reflectionRay[mirrorType=SPH](5,\rA)(Ptemp){E}
- \arrowLine[linecolor=red,linewidth=1.5pt](7,\rA)(Ptemp){1}
- \psline[linecolor=red,arrows=->,linewidth=1.5pt](Ptemp)(E)
- \psOutLine[linecolor=red,length=6,linewidth=1.5pt,arrows=->](Ptemp)(E){EEnd}
- \psOutLine[linecolor=red,length=3,linestyle=dashed,linewidth=0.5pt](E)(Ptemp){EEnd}}
-\end{pspicture*}
-\end{LTXexample}
-\xLcs{mirrorDVG}\xLkeyset{mirrorType=SPH}\xLcs{ABinterSPHLens}\xLcs{refractionRay}
-
-\bgroup
-\raggedright
-\nocite{*}
-\bibliographystyle{plain}
-\bibliography{pst-optic-doc}
-\egroup
-
-\printindex
-
-\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-optic/pst-optic-doc.bib new/doc/generic/pst-optic/pst-optic-doc.bib
--- old/doc/generic/pst-optic/pst-optic-doc.bib 2009-02-15 01:42:49.000000000 +0100
+++ new/doc/generic/pst-optic/pst-optic-doc.bib 2016-11-25 19:27:50.000000000 +0100
@@ -1,80 +1,98 @@
+@STRING{tugboat = {TUGboat} }
@STRING{dtk = {{D}ie {\TeX}nische {K}om{\"o}die} }
+@Book{companion,
+ author = {Michel Goosens and Frank Mittelbach and Sebastian Rahtz and Dennis Roegel and Herbert Vo\ss},
+ title = {The {\LaTeX} {G}raphics {C}ompanion},
+ publisher = {{Addison-Wesley Publishing Company}},
+ edition = 2,
+ year = {2007},
+ address = {Boston, Mass.}
+}
+
+@Article{girou:01:,
+ author = {Denis Girou},
+ title = {Pr\'esentation de {PST}ricks},
+ journal = {Cahier {GUT}enberg},
+ year = 1994,
+ volume = {16},
+ month = apr,
+ pages = {21-70}
+}
+
+@Article{girou:02:,
+ author = {{Timothy Van} Zandt and Denis Girou},
+ title = {Inside {PST}ricks},
+ journal = TUGboat,
+ year = 1994,
+ volume = {15},
+ month = sep,
+ pages = {239-246}
+}
+
@Book{PostScript,
Author = {Kollock, Nikolai G.},
- Title = {PostScript richtig eingesetzt: vom Konzept zum
- praktischen Einsatz},
+ Title = {Post{S}cript richtig eingesetzt: vom {K}onzept zum
+ praktischen {E}insatz},
Publisher = {IWT},
Address = {Vaterstetten},
year = 1989,
}
-@Manual{pstricks,
- Title = {PSTricks - {\PS} macros for Generic TeX},
- Author = {Timothy Van Zandt},
- Organization = {},
- Address = {\url{http://www.tug.org/application/PSTricks}},
- Note = {},
- year = 1993,
+@ctan{multido,
+ Title = {\texttt{multido.tex} - a loop macro, that supports fixed-point addition},
+ Author = {{Timothy Van} Zandt},
+ url = {/macros/generic/multido.tex},
+ year = 1997
}
+@Book{PSTricks2,
+ author = {Herbert Vo\ss{}},
+ title = {\texttt{PSTricks} -- {G}rafik f\"ur \TeX{} und \LaTeX},
+ edition = {7},
+ publisher = {DANTE -- Lehmanns},
+ year = {2016},
+ address = {Heidelberg/Hamburg}
+}
-@Manual{pdftricks,
- Title = {PSTricks Support for pdf},
- Author = {Herbert Voss},
- Organization = {},
- Address = {\url{http://PSTricks.de/pdf/pdfoutput.phtml}},
- Note = {},
- year = 2002,
+@Book{PSTricksE,
+ author = {Herbert Vo\ss{}},
+ title = {\texttt{PSTricks} -- {G}raphics and {P}ost{S}cript for \LaTeX},
+ edition = {1},
+ publisher = {UIT},
+ year = {2011},
+ address = {Cambridge -- UK}
+}
+
+@Book{LTXquick,
+ author = {Herbert Vo\ss{}},
+ title = {{\LaTeX} quick reference},
+ edition = {1},
+ publisher = {UIT},
+ year = {2012},
+ address = {Cambridge -- UK}
}
-@Manual{miwi,
- Title = {References for \TeX{} and Friends},
- Author = {Michael Wiedmann and Peter Karp},
- Organization = {},
- Address = {\url{http://www.miwie.org/tex-refs/}},
- Note = {},
- year = 2003,
+@Book{presentations,
+ author = {Herbert Vo\ss},
+ title = {Presentations with \LaTeX},
+ edition = {1},
+ publisher = {DANTE -- Lehmanns Media},
+ year = {2012},
+ address = {Heidelberg/Berlin}
}
-@Manual{pstlens:2001,
- Title = {PST-lens - {\PS} macros for Generic TeX},
- Author = {Denis Girou and Manuel Luque},
- Organization = {},
- Address = {\url{ftp://ftp.dante.de/tex-archive/graphics/pstricks/contrib/pst-lens/}},
- Note = {},
- year = 2001,
+@Book{tbt,
+ author = {Victor Eijkhout},
+ title = {\TeX\ by Topic -- {A} \TeX{}nician Reference},
+ edition = {1},
+ publisher = {DANTE -- lehmanns media},
+ year = {2014},
+ address = {Heidelberg/Berlin}
}
-@Manual{vue3d:2002,
- Title = {Vue en 3D},
- Author = {Manuel Luque},
- Organization = {},
- Address = {\url{http://members.aol.com/Mluque5130/vue3d16112002.zip}},
- Note = {},
- year = 2002,
-}
-@Article{dtk02.2:jackson.voss:plot-funktionen,
- author = {Laura E. Jackson and Herbert Vo{\ss}},
- title = {Die {P}lot-{F}unktionen von {\texttt{pst-plot}}},
- journal = dtk,
- year = 2002,
- volume = {2/02},
- altvolume = 2,
- altnumber = 14,
- month = jun,
- pages = {27--34},
- annote = bretter,
- keywords = {},
- abstract = { Im letzten Heft wurden die mathematischen Funktionen von
- \PS~im Zusammenhang mit dem {\LaTeX}-Paket
- \texttt{pst-plot} zum Zeichnen von Funktionen beschrieben
- und durch Beispiele erl{\"a}utert. In diesem Teil werden
- die bislang nur erw{\"a}hnten Plot-Funktionen f{\"u}r
- externe Daten behandelt. }
-}
@Article{dtk02.1:voss:mathematischen,
author = {Herbert Vo{\ss}},
@@ -85,9 +103,8 @@
altvolume = 1,
altnumber = 14,
month = mar,
- pages = {40-47},
+ pages = {40--47},
annote = bretter,
- keywords = {},
abstract = { \PS, faktisch genauso alt wie {\TeX}, ist im
Verh{\"a}ltnis dazu allgemein noch weniger bekannt, wenn es
darum geht zu beurteilen, was es denn nun im eigentlichen
@@ -99,30 +116,10 @@
gezeigt. }
}
-
-@Book{companion,
- author = {Michel Goosens and Frank Mittelbach and Serbastian Rahtz and Denis Roegel and Herbert Vo\ss},
- title = {The {\LaTeX} {G}raphics {C}ompanion},
- publisher = {{Addison-Wesley Publishing Company}},
- year = {2007},
- edition = {2nd},
- address = {Reading, Mass.}
-}
-
-@Book{PSTricks2,
- author = {Herbert Vo\ss},
- title = {\texttt{PSTricks} -- {G}rafik f\"ur \TeX{} und \LaTeX},
- edition = {5.},
- publisher = {DANTE -- Lehmanns},
- year = {2008},
- address = {Heidelberg/Hamburg}
-}
-
-@Book{voss:math,
- author = {Herbert Vo\ss},
- title = {\LaTeX\ in {M}athematik und {N}aturwissenschaften},
- publisher = {{Franzis-Verlag}},
- year = {2006},
- address = {Poing}
+@ctan{pstlens:2001,
+ Title = {PST-lens - {\PS} macros for Generic TeX},
+ Author = {Denis Girou and Manuel Luque},
+ url = {/graphics/pstricks/contrib/pst-lens/},
+ year = 2001,
}
Binary files old/doc/generic/pst-optic/pst-optic-doc.pdf and new/doc/generic/pst-optic/pst-optic-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-optic/pst-optic-doc.tex new/doc/generic/pst-optic/pst-optic-doc.tex
--- old/doc/generic/pst-optic/pst-optic-doc.tex 2010-09-13 18:36:21.000000000 +0200
+++ new/doc/generic/pst-optic/pst-optic-doc.tex 2016-11-25 19:27:50.000000000 +0100
@@ -8,6 +8,9 @@
\lstset{pos=t,wide=true,language=PSTricks,basicstyle=\footnotesize\ttfamily}
\let\belowcaptionskip\abovecaptionskip
%
+\usepackage[style=dtk]{biblatex}
+\addbibresource{\jobname.bib}
+
\begin{document}
\title{\texttt{pst-optic}}
@@ -16,6 +19,13 @@
\author{Manuel Luque \\Herbert Vo\ss}
\docauthor{Herbert Vo\ss}
\date{\today}
+\def\bgImage{\begin{pspicture*}(-0.5,-4)(8,4)
+ \rput(0,0){\mirrorCVG[mirrorHeight=8,mirrorDepth=4,drawing=false]}
+ \multido{\rY=-4.00+0.25}{33}{%
+ \mirrorCVGRay[linewidth=0.5pt,mirrorHeight=8,
+ mirrorDepth=4](10,\rY)(1,\rY){Dummy}}
+\end{pspicture*}}
+
\maketitle
\tableofcontents
@@ -88,7 +98,7 @@
\begin{LTXexample}
\begin{pspicture}[showgrid=true](-5,-2.2)(7,4)
\rput(1.5,1.5){%
- \lens[lensType=DVG,lensGlass=true,lensWidth=0.5,rayColor=red,
+ \lens[lensType=DVG,lensGlass,lensWidth=0.5,rayColor=red,
focus=-2,AB=2,spotAi=270,spotBi=90]}
\end{pspicture}
\end{LTXexample}
@@ -194,6 +204,7 @@
Lense width in cm & \Lkeyword{lensWidth} & 0.5cm\footnotemark\\
vertical scale (obsolet) & \Lkeyword{lensScale} & 1\\
View the lens & \Lkeyword{lensGlass} & \false\\
+ show onyl the rays & \Lkeyword{onlyrays} & \false\\
Second lens & \Lkeyword{lensTwo} & \false\\
Focus in cm & \Lkeyword{focus} & 2\\
Distance $\mathrm{\overline{OA}}$& \Lkeyword{OA} & -4\\
@@ -245,8 +256,8 @@
\begin{LTXexample}[wide=false]
\begin{pspicture*}(-7.5,-2.75)(7.5,3)
-\rput(0,0){\lens[lensScale=0.6,XO=-4,focus=1,OA=-2,lensGlass=true, lensWidth=0.5]}
-\rput(0,0){\lens[lensScale=1.2,XO=2,focus=2,lensGlass=true,lensWidth=0.5]}
+\rput(0,0){\lens[lensScale=0.6,XO=-4,focus=1,OA=-2,lensGlass, lensWidth=0.5]}
+\rput(0,0){\lens[lensScale=1.2,XO=2,focus=2,lensGlass,lensWidth=0.5]}
\end{pspicture*}
\end{LTXexample}
\vspace*{-2ex}
@@ -254,9 +265,9 @@
\begin{LTXexample}[wide=false]
\begin{pspicture*}(-7.5,-2.75)(7.5,3)
-\rput(0,0){\lens[lensScale=0.6,XO=-4,focus=1,OA=-2,lensGlass=, lensWidth=0.5]}
+\rput(0,0){\lens[lensScale=0.6,XO=-4,focus=1,OA=-2,lensGlass, lensWidth=0.5]}
\Transform
-\rput(0,0){\lens[lensScale=1.2,XO=2,focus=2,lensTwo=true,lensGlass=true,lensWidth=0.5]}
+\rput(0,0){\lens[lensScale=1.2,XO=2,focus=2,lensTwo=true,lensGlass,lensWidth=0.5]}
\end{pspicture*}
\end{LTXexample}
\vspace*{-2ex}
@@ -265,12 +276,12 @@
\begin{LTXexample}[wide=false]
\begin{pspicture*}(-7.5,-2.75)(7.5,3)
\rput(0,0){\lens[lensScale=0.6,XO=-4,nameF=F_1,nameA=A_1,nameB=B_1,
- nameFi=F'_1,nameAi={ },nameBi={},nameO=O_1,focus=1,OA=-2,lensGlass=true, lensWidth=0.5]}
+ nameFi=F'_1,nameAi={ },nameBi={},nameO=O_1,focus=1,OA=-2,lensGlass, lensWidth=0.5]}
\pspolygon[style=rayuresJaunes,linestyle=none](B)(I)(B')(I')(B)
\Transform
\rput(0,0){\lens[lensScale=1.2,XO=2,focus=2,nameA=A'_1,spotA=90,nameB=B'_1,spotB=270,
nameO=O_2,nameAi=A'_2,spotAi=270,nameBi=B'_2,spotBi=90,nameF=F_2,nameFi=F'_2,
- lensTwo=true,lensGlass=true,lensWidth=0.5]}
+ lensTwo=true,lensGlass,lensWidth=0.5]}
\pspolygon[style=rayuresJaunes,linestyle=none](B)(I)(B')(I')(B)
\end{pspicture*}
\end{LTXexample}
@@ -1148,7 +1159,7 @@
\psOutLine[linecolor=red,length=9](0,\nCountA)(FF){P2}}
\psline[linecolor=blue](A)(FF)
\psOutLine[linecolor=blue,length=5](A)(FF){END1}
-\rput(0,0){\lens[yBottom=-3.5,yTop=3.5,lensGlass=true,lensHeight=6.5,drawing=false,
+\rput(0,0){\lens[yBottom=-3.5,yTop=3.5,lensGlass,lensHeight=6.5,drawing=false,
spotFi=315,lensWidth=0.5]
\psline[linewidth=1pt](xLeft)(xRight)
\psline[length=2,linewidth=2pt,arrows=->](F')(FF)}
@@ -1307,8 +1318,7 @@
\bgroup
\raggedright
\nocite{*}
-\bibliographystyle{plain}
-\bibliography{pst-optic-doc}
+\printbibliography
\egroup
\printindex
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-optic.doc.tlpobj new/tlpkg/tlpobj/pst-optic.doc.tlpobj
--- old/tlpkg/tlpobj/pst-optic.doc.tlpobj 2016-04-14 19:37:42.000000000 +0200
+++ new/tlpkg/tlpobj/pst-optic.doc.tlpobj 2017-04-14 17:56:25.000000000 +0200
@@ -1,14 +1,11 @@
name pst-optic.doc
category Package
-revision 19704
+revision 41999
shortdesc doc files of pst-optic
relocated 1
-docfiles size=244
+docfiles size=124
RELOC/doc/generic/pst-optic/Changes
RELOC/doc/generic/pst-optic/README
- RELOC/doc/generic/pst-optic/more_docs/dtk.pdf
- RELOC/doc/generic/pst-optic/more_docs/pst-optic-examples.pdf
- RELOC/doc/generic/pst-optic/more_docs/pst-optic-examples.tex
RELOC/doc/generic/pst-optic/pst-optic-doc.bib
RELOC/doc/generic/pst-optic/pst-optic-doc.pdf
RELOC/doc/generic/pst-optic/pst-optic-doc.tex
++++++ pst-optic.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/pst-optic/pst-optic.tex new/tex/generic/pst-optic/pst-optic.tex
--- old/tex/generic/pst-optic/pst-optic.tex 2010-09-13 18:36:21.000000000 +0200
+++ new/tex/generic/pst-optic/pst-optic.tex 2016-11-25 19:33:37.000000000 +0100
@@ -30,8 +30,8 @@
\ifx\PSTMultidoLoaded\endinput\else\input multido.tex\fi
\ifx\PSTXKeyLoaded\endinput\else \input pst-xkey\fi
%
-\def\fileversion{1.01}
-\def\filedate{2010/07/23}
+\def\fileversion{1.02}
+\def\filedate{2016/07/10}
\message{`PST-Optic' v\fileversion, \filedate\space (Manuel Luque and Herbert Voss)}
%
\edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
@@ -81,10 +81,11 @@
%
\define@boolkey[psset]{pst-optic}[Pst@]{lensTwo}[false]{} % is a second lens present?
\define@boolkey[psset]{pst-optic}[Pst@]{lensGlass}[true]{}% draw a _real_ lens?
+\define@boolkey[psset]{pst-optic}[Pst@]{onlyrays}[true]{}% draw only the rays?
\define@boolkey[psset]{pst-optic}[Pst@]{drawing}[true]{} % draw the nodes and rays?
\define@boolkey[psset]{pst-optic}[Pst@]{rightRay}[false]{}% a ray on the right side?
%
-\psset[pst-optic]{lensGlass,drawing,lensTwo,rightRay}
+\psset[pst-optic]{lensGlass,drawing,lensTwo,rightRay,onlyrays=false}
%
% ------- the global definitions for the pspicture frame ------
%
@@ -367,7 +368,7 @@
/YA \pst@tempA exch pop \pst@number\psyunit div def
/XA \pst@tempA pop \pst@number\psxunit div def
YA 0 eq XA 0 eq and {0 0}{
- /r XA dup mul YA dup mul add sqrt def
+ /r XA dup mul YA dup mul add Sqrt def
/AlphaOld YA XA atan def
/AlphaNew AlphaOld \pst@optic@angle\space add def
r AlphaNew cos mul r AlphaNew sin mul
@@ -447,13 +448,13 @@
\pscustom{%
\parametricplot{\psk@optic@lensHeight}{-\psk@optic@lensHeight}{%
/arg t radius 2.0 mul div def
- arg 1 arg dup mul sub sqrt atan
+ arg 1 arg dup mul sub Sqrt atan
cos 1 sub radius mul neg Width2 sub
t 2.0 div
}
\parametricplot{-\psk@optic@lensHeight}{\psk@optic@lensHeight}{%
/arg t radius 2.0 mul div def
- arg 1 arg dup mul sub sqrt atan
+ arg 1 arg dup mul sub Sqrt atan
cos 1 sub radius mul neg Width2 sub neg
t 2.0 div
}
@@ -466,7 +467,7 @@
% (-d-w/2,h/2)->(-d-w/2,-h/2)
\parametricplot{\psk@optic@lensHeight}{-\psk@optic@lensHeight}{%
/arg t 2.0 div radius div def
- arg 1 arg dup mul sub sqrt atan cos 1 sub radius mul Width2 sub
+ arg 1 arg dup mul sub Sqrt atan cos 1 sub radius mul Width2 sub
t 2.0 div
}
% (-d-w/2,-h/2)(d+w/2,-h/2)
@@ -474,7 +475,7 @@
% (d+w/2,-h/2)->(d+w/2,h/2)
\parametricplot{-\psk@optic@lensHeight}{\psk@optic@lensHeight}{%
/arg t 2.0 div radius div def
- 1 arg 1 arg dup mul sub sqrt atan cos sub radius mul Width2 add
+ 1 arg 1 arg dup mul sub Sqrt atan cos sub radius mul Width2 add
t 2.0 div
}
\fill
@@ -616,11 +617,11 @@
/dX XB XA sub def
dX abs 0.01 lt {
% a horizontal line
- /Y YM radius dup mul XA dup mul sub sqrt YM 0 gt {sub}{add}ifelse def
- /YSecond YM radius dup mul XA dup mul sub sqrt YM 0 gt {add}{sub}ifelse def
+ /Y YM radius dup mul XA dup mul sub Sqrt YM 0 gt {sub}{add}ifelse def
+ /YSecond YM radius dup mul XA dup mul sub Sqrt YM 0 gt {add}{sub}ifelse def
/X XA def
/XSecond XA def
- /mT XA radius dup mul XA dup mul sub sqrt div YM 0 lt {neg}if def
+ /mT XA radius dup mul XA dup mul sub Sqrt div YM 0 lt {neg}if def
Y X neg
}{
/dY YB YA sub def
@@ -629,12 +630,12 @@
/klammer YM m XA mul add YA sub def
/p2neg klammer m mul m21 div def
/q klammer dup mul radius dup mul sub m21 div def
- /root p2neg dup mul q sub sqrt def
+ /root p2neg dup mul q sub Sqrt def
/X p2neg root YM m mul 0 gt {sub}{add}ifelse def
/XSecond p2neg root YM m mul 0 gt {add}{sub}ifelse def
/Y m X XA sub mul YA add def
/YSecond m XSecond XA sub mul YA add def
- /mT X radius dup mul X dup mul sub sqrt div YM 0 lt {neg}if def
+ /mT X radius dup mul X dup mul sub Sqrt div YM 0 lt {neg}if def
Y X neg
} ifelse){#4}
\else% DVG
@@ -649,10 +650,10 @@
/dX XB XA sub def
dX abs 0.01 lt {
% a horizontal line
- /Y YM radius dup mul XA dup mul sub sqrt YM 0 gt {sub}{add}ifelse def
- /YSecond YM radius dup mul XA dup mul sub sqrt YM 0 gt {add}{sub}ifelse def
+ /Y YM radius dup mul XA dup mul sub Sqrt YM 0 gt {sub}{add}ifelse def
+ /YSecond YM radius dup mul XA dup mul sub Sqrt YM 0 gt {add}{sub}ifelse def
/X XA def
- /mT XA radius dup mul XA dup mul sub sqrt div YM 0 lt {neg}if def
+ /mT XA radius dup mul XA dup mul sub Sqrt div YM 0 lt {neg}if def
/XSecond XA def
Y X neg
}{
@@ -662,12 +663,12 @@
/klammer YM m XA mul add YA sub def
/p2neg klammer m mul m21 div def
/q klammer dup mul radius dup mul sub m21 div def
- /root p2neg dup mul q sub sqrt def
+ /root p2neg dup mul q sub Sqrt def
/X p2neg root YM m mul 0 gt {sub}{add}ifelse def
/XSecond p2neg root YM m mul 0 gt {add}{sub}ifelse def
/Y m X XA sub mul YA add def
/YSecond m XSecond XA sub mul YA add def
- /mT X radius dup mul X dup mul sub sqrt div YM 0 lt {neg}if def
+ /mT X radius dup mul X dup mul sub Sqrt div YM 0 lt {neg}if def
Y X neg
} ifelse){#4}
\fi
@@ -793,8 +794,9 @@
\pnode(! \psk@optic@xRight\space A'B' YO add){I1}%
\pnode(! \psk@optic@xRight\space neg A'B' YO add){I2}%
\fi%
+ \ifPst@onlyrays\else
\begingroup%
- \ifPst@lensGlass%
+ \ifPst@lensGlass
\rput(! XO YO){%
\ifx\psk@optic@lensType\lensTypeCVG\lensCVG%
\else\ifx\psk@optic@lensType\lensTypePCVG\lensCVG
@@ -811,14 +813,15 @@
(! XO 0.5 \psk@optic@lensHeight\space mul
\psk@optic@lensScale\space mul YO add)%
\fi%
- \endgroup%
+ \endgroup
+ \fi
\ifPst@drawing
% axe optique
\psline[style=opticalAxis](! \psk@optic@xLeft\space YO)(! \psk@optic@xRight\space YO)
\ifx\psk@optic@lensType\lensTypeDVG\pst@drawDVGRays\else
\ifx\psk@optic@lensType\lensTypePDVG\pst@drawDVGRays\else
\pst@drawCVGRays\fi\fi
- \fi%
+ \fi
\end{pspicture*}%
}\ignorespaces}
%
@@ -1005,7 +1008,7 @@
XB XA sub abs 0.01 lt {A XA dup mul mul XA neg}{
/m YB YA sub XB XA sub div def
/m2a m A div 2 div def
- /Root m2a dup mul m XA mul YA sub A div sub sqrt def
+ /Root m2a dup mul m XA mul YA sub A div sub Sqrt def
/Xp m2a Root add XA sub def
/Xn m2a Root sub XA sub def
/YSp m Xp mul YA add def
@@ -1055,7 +1058,7 @@
/NoMoreReflection false def
% pq Formel anwenden
/m2a m A div 2 div def
- /Root m2a dup mul m XA mul YA sub A div sub sqrt def
+ /Root m2a dup mul m XA mul YA sub A div sub Sqrt def
/X1 m2a Root add def
/X2 m2a Root sub def
% be sure, that we get the right point
@@ -1173,7 +1176,7 @@
\else
\parametricplot{\psk@optic@mirrorHeight}{-\psk@optic@mirrorHeight}{%
/radD radius \psk@optic@mirrorWidth\space add def
- radius \psk@optic@mirrorWidth\space sub radD dup mul t 2 div dup mul sub sqrt sub t 2 div }
+ radius \psk@optic@mirrorWidth\space sub radD dup mul t 2 div dup mul sub Sqrt sub t 2 div }
\fi
% (d-w,-h/2)(d,-h/2)
\psline(!%
@@ -1187,7 +1190,7 @@
t 2 exp 4 div mul t 2 div }
\else
\parametricplot{-\psk@optic@mirrorHeight}{\psk@optic@mirrorHeight}{
- radius dup dup mul t 2 div dup mul sub sqrt sub t 2 div }
+ radius dup dup mul t 2 div dup mul sub Sqrt sub t 2 div }
\fi
\fill
}%
@@ -1278,7 +1281,7 @@
Depth Height dup mul div t 2 exp 4 div mul neg t 2 div }
\else
\parametricplot{\psk@optic@mirrorHeight}{-\psk@optic@mirrorHeight}{%
- radius dup mul t 2 div dup mul sub sqrt radius sub t 2 div }
+ radius dup mul t 2 div dup mul sub Sqrt radius sub t 2 div }
\fi
% (d-w,-h/2)(d,-h/2)
\psline(! Depth Width add neg Height neg)(! Depth neg Height neg)%
@@ -1288,7 +1291,7 @@
Depth Height dup mul div t 2 exp 4 div mul neg Width sub t 2 div }
\else
\parametricplot{-\psk@optic@mirrorHeight}{\psk@optic@mirrorHeight}{%
- radius Width sub dup mul t 2 div dup mul sub sqrt radius sub t 2 div }
+ radius Width sub dup mul t 2 div dup mul sub Sqrt radius sub t 2 div }
\fi
\fill%
}
@@ -1356,7 +1359,7 @@
/Xmax \psk@optic@mirrorHeight\space 2 div def
/m YB YA sub XB XA sub div def
/m2a m A div 2 div def
- /Root m2a dup mul m XA mul YA sub A div sub sqrt def
+ /Root m2a dup mul m XA mul YA sub A div sub Sqrt def
/X1 m2a Root add def
/X2 m2a Root sub def
/X XB X1 sub abs XB X2 sub abs lt
@@ -1565,7 +1568,7 @@
def
/xA' 2 xH mul XA sub def
/yA' 2 yH mul YA sub def
- /D12 Dx Dx mul Dy Dy mul add sqrt def
+ /D12 Dx Dx mul Dy Dy mul add Sqrt def
xA' yA' moveto
xH yH rlineto
xA' yA'){#4}
@@ -1660,7 +1663,7 @@
% sin(Beta)>1 is a total reflection instead of a refraction
/sinBeta \pst@optic@cIn\space \pst@optic@cOut\space div Alpha sin mul def
sinBeta abs 1 le{
- /Root 1 sinBeta dup mul sub sqrt def
+ /Root 1 sinBeta dup mul sub Sqrt def
/Beta sinBeta Root atan def
}{
/Beta 180 Alpha sub def
@@ -1700,7 +1703,7 @@
/dX1 XA XP sub def
/signum YP 0 lt {-1}{1}ifelse def
% the gradient of the point. radius must be defined
- /root radius dup mul XP dup mul sub sqrt def
+ /root radius dup mul XP dup mul sub Sqrt def
/Gamma XP signum mul root atan 180 sub def
% the angle of the incoming ray
/AlphaStrich dY1 dX1 atan 180 sub def
@@ -1773,7 +1776,7 @@
% Les datas
% Sellmeier's
% glass sf15 : verre flint
- % n=sqrt(1+B1*L^2/(l^2-C1)+B2*L^2/(l^2-C2)+B3*L^2/(l^2-C3))
+ % n=Sqrt(1+B1*L^2/(l^2-C1)+B2*L^2/(l^2-C2)+B3*L^2/(l^2-C3))
% Cauchy : /N {1.606 6545 1 mul lambda dup mul div add} bind def
/L2 {lambda 1e-3 mul dup mul} bind def % en microm�tres
/N {1
@@ -1783,7 +1786,7 @@
add
1.038164 L2 mul L2 116.416755 sub div
add
- sqrt} bind def
+ Sqrt} bind def
/alpha1 AnglePlan1 AnglePrism add def
/sinB1 alpha1 sin N div def
/B1 sinB1 arcsin def
@@ -1943,14 +1946,14 @@
% Les datas
% Sellmeier's
% glass sf15 : verre flint lourd
- % n=sqrt(1+B1*L^2/(l^2-C1)+B2*L^2/(l^2-C2)+B3*L^2/(l^2-C3))
+ % n=Sqrt(1+B1*L^2/(l^2-C1)+B2*L^2/(l^2-C2)+B3*L^2/(l^2-C3))
% Cauchy : /N {1.606 6545 1 mul lambda dup mul div add} bind def
/L2 {lambda 1e-3 mul dup mul} bind def
/N {1
1.539259 L2 mul L2 0.011931 sub div add
0.247621 L2 mul L2 0.055608 sub div add
1.038164 L2 mul L2 116.416755 sub div add
- sqrt} bind def
+ Sqrt} bind def
/alpha1 AnglePlan1 AnglePrism add def
/sinB1 alpha1 sin N div def
/B1 sinB1 asin def
@@ -1997,7 +2000,7 @@
\def\resetOpticOptions{% hv 2006-07-20
\newpsstyle{opticalAxis}{linewidth=0.5pt,linecolor=black,linestyle=solid}
\psset[pst-optic]{%
- lensGlass=false,drawing=true,,lensTwo,rightRay,
+ lensGlass=false,drawing=true,,lensTwo,rightRay,onlyrays=false,
xLeft=-7.5,xRight=7.5,yBottom=-3.0,yTop=3.0,
lensType=CVG,lensColor=lightgray,lensWidth=0.5,lensDepth=1,
lensHeight=5,lensScale=1,lensArrowSize=0.2,lensArrowInset=0.5,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-optic.tlpobj new/tlpkg/tlpobj/pst-optic.tlpobj
--- old/tlpkg/tlpobj/pst-optic.tlpobj 2016-04-14 19:37:43.000000000 +0200
+++ new/tlpkg/tlpobj/pst-optic.tlpobj 2017-04-14 17:56:25.000000000 +0200
@@ -1,16 +1,16 @@
name pst-optic
category Package
-revision 19704
+revision 41999
shortdesc Drawing optics diagrams
relocated 1
longdesc A package for drawing both reflective and refractive optics
longdesc diagrams. The package requires pstricks later than version
longdesc 1.10.
-runfiles size=19
+runfiles size=20
RELOC/tex/generic/pst-optic/pst-optic.tex
RELOC/tex/latex/pst-optic/pst-optic.sty
catalogue-ctan /graphics/pstricks/contrib/pst-optic
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-09-05 23:50:16 +0200
catalogue-license lppl
catalogue-topics physics diagram pstricks
-catalogue-version 1.01
+catalogue-version 1.02
++++++ pst-osci.doc.tar.xz ++++++
++++++ pst-osci.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-osci.tlpobj new/tlpkg/tlpobj/pst-osci.tlpobj
--- old/tlpkg/tlpobj/pst-osci.tlpobj 2016-04-14 19:37:43.000000000 +0200
+++ new/tlpkg/tlpobj/pst-osci.tlpobj 2017-04-14 17:56:26.000000000 +0200
@@ -14,7 +14,7 @@
RELOC/tex/generic/pst-osci/pst-osci.tex
RELOC/tex/latex/pst-osci/pst-osci.sty
catalogue-ctan /graphics/pstricks/contrib/pst-osci
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics graphics-use pstricks
catalogue-version 2.82